Branching for 1025 @119867

git-svn-id: http://src.chromium.org/svn/branches/1025/src@119877 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 119918 - mac: Fix iframe scrolling regression introduced in r119701

BUG=112085
TEST=see bug. swiping on ntp still doesn't do pane switching.
TBR=rsesek

Review URL: https://chromiumcodereview.appspot.com/9311002

TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9316001

git-svn-id: http://src.chromium.org/svn/branches/1025/src@119919 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Revert 119769 - Switch AudioDevice classes from SyncSocket to CancelableSyncSocket.
This fixes the double close issue and makes Stop() instant.
Also, this addresses some issues reported by tsan (see bug reports).

BUG=103711,95509
TEST=content_unittests,media_unittests


Review URL: http://codereview.chromium.org/9121045

TBR=tommi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317001

git-svn-id: http://src.chromium.org/svn/branches/1025/src@119921 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Revert 119758 - Add skeleton for file cleanup and cache renaming during translation.
Plumbing the cache name through remains to be done, as does correctly handling
quota for object temporary file removal.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9288046

TBR=sehr@google.com
Review URL: https://chromiumcodereview.appspot.com/9312002

git-svn-id: http://src.chromium.org/svn/branches/1025/src@119929 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Incrementing VERSION to 18.0.1025.1

git-svn-id: http://src.chromium.org/svn/branches/1025/src@119930 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120098 - PluginLoaderPosix: Fix the case where the utility process crashes after all plugins have been loaded.

This was causing a crash on load on my system.

BUG=111935
TEST=none
R=rsesek

Review URL: https://chromiumcodereview.appspot.com/9297049

TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9316047

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120102 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120087 - Handle NULL load_event_start.

BUG=112006


Review URL: http://codereview.chromium.org/9301043

TBR=dominich@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9320022

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120119 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120123 - Fix crash in ExtensionService::InitializePermissions().

This crash occurs when an unpacked extension changes IDs by adding a key to its manifest. The extension preferences are stored under the old key. This started causing problems because now we record granted permissions for unpacked extensions.

BUG=112301
TEST=ExtensionServiceTest.UnpackedExtensionCanChangeID

Review URL: https://chromiumcodereview.appspot.com/9320021

TBR=jstritar@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317042

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120127 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120121 - Fix crash in CreateTabFunction::RunImpl().

BUG=112314
TEST=ExtensionApiTest.Tabs2

Review URL: https://chromiumcodereview.appspot.com/9320016

TBR=jstritar@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317043

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120128 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 119971 - Include a timestamp with and add a keyboard shortcut for Feedback.
Everytime a user clicks on the Feedback menu item or presses ctrl+alt+i on ChromeOS, record the exact time of that happening and send it in the feedback report the user submits.


R=zelidrag@chromium.org,adlr@chromium.org
BUG=chromium-os:25678
TEST=Tested with sending several reports invoked both by the shortcut and the menu item.


Review URL: http://codereview.chromium.org/9104030

TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9314051

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120129 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Incrementing VERSION to 18.0.1025.2

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120152 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 119904 - [filebrowser] Double-click and hitting enter now try default browser action, if no handler is defined.

BUG=chromium-os:17507
TEST=See bug.
Review URL: https://chromiumcodereview.appspot.com/9293034

TBR=dgozman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317049

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120195 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120072 - Make sure even if chrome crashes on login we properly populate the  use_shared_proxies pref.

This is necessary to enforce proper operation if the browser crashes too
early in the login sequence and the preferences file has not been stored
yet.

BUG=chromium-os:25703
TEST=Manually tested by putting a DCHECK just after setting the pref in LoginUtilsImpl::OnProfileCreated.

Review URL: https://chromiumcodereview.appspot.com/9314031

TBR=pastarmovj@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317050

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120202 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120013 - Quick-and-dirty hacks for getting policy working behind proxies.

This is check-in for mattias.
Original review: http://codereview.chromium.org/9315011/

Note that this hard-wires policy OAuth fetching in login_utils.cc to the
authentication profile. I'm not entirely sure this is a good idea, but
required since the user profile isn't in a state to allow successful
requests at this point (the use-shared-proxies flag is off). Other stuff
in login_utils.cc might need the hack too (sync?).

BUG=chromium-os:25703
TEST=Verify fix for chromium-os:25703
TBR=mnissler@chromium.org,zelidrag@chromium.org,sumit@chromium.org,pastarmovj@chromium.org,kuan@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9309024

TBR=xiyuan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9309053

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120203 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 119886 - [cros] Strings for the password changed message on sign-in screen [part 3]


BUG=chromium-os:24984
TEST=manual


Review URL: http://codereview.chromium.org/9303026

TBR=altimofeev@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9309054

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120210 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120099 - Deliver NOTIFICATION_SESSION_STARTED if the browser crashes and is restarted.

BUG=112109
TEST=Crash the browser and verify that screenlocker observers have been registered (i.e. short power press works).

Review URL: https://chromiumcodereview.appspot.com/9310002

TBR=flackr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9317057

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120228 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 119944 - [uber page] Minor style improvements.

- Fix font-family property for link-buttons.
- Change to rgb() colors for per webui style guidelines.

BUG=100885
Review URL: https://chromiumcodereview.appspot.com/9310003

TBR=csilv@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9310069

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120231 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120006 - [uber page] Fix url handling for uber-page sub-paths.

BUG=111900
TEST=Invoke 'Clear Browsing Data' from the wrench menu, should bring up the correct dialog.
Review URL: https://chromiumcodereview.appspot.com/9309018

TBR=csilv@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9325005

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120232 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge 120045 - [uber page] Improve URL mapping for extension URLS.

BUG=111900
TEST=Verify that the 'Manage extensions' contextual menu invokes the extensions page.
Review URL: https://chromiumcodereview.appspot.com/9318019

TBR=csilv@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9325006

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120233 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Incrementing VERSION to 18.0.1025.3

git-svn-id: http://src.chromium.org/svn/branches/1025/src@120234 4ff67af0-8c30-449e-8e8b-ad334ec8d88c