summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add nacl-gdb-script switch. halyavin@google.com2012-05-308-22/+77
| | | | | | | | | | | It points to a script that will be executed by nacl-gdb at startup. BUG= 117010 TEST= browser_tests --gtest_filter=NaClGdbScript* Review URL: https://chromiumcodereview.appspot.com/10447012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139524 0039d316-1c4b-4281-b951-d872f2087c98
* Don't throw away GPU data on non-PCI architecturesskyostil@google.com2012-05-301-3/+5
| | | | | | | | | | | | | | | GpuDataManagerImpl checks whether we know the GPU's PCI vendor and device id. If not, the collected GPU data is thrown away and is not shown in about:gpu. Since most non-x86 architectures are also non-PCI, only do this check on the x86 family. BUG=130013 TEST=none Review URL: https://chromiumcodereview.appspot.com/10456005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139523 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139482 - Reused target.mkwst@chromium.org2012-05-301-1/+9
| | | | | | | | | | | | | | | | Looks like this broke the Windows clobber bot: http://chromegw.corp.google.com/i/chromium/builders/Win/builds/11337 BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10458019 TBR=vitalybuka@chromium.org Review URL: https://chromiumcodereview.appspot.com/10443082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139522 0039d316-1c4b-4281-b951-d872f2087c98
* Add a CHECK() in NPChannelBase::GetChannel() to help investigate crbug.com/97285steveblock@chromium.org2012-05-301-0/+4
| | | | | | | | | | | | | This will indicate whether the crash is because the NPChannelBase fails to find the named channel in its map, or whether it's because we try to re-initialize an existing channel with an invalid socket FD. BUG=97285 Review URL: https://chromiumcodereview.appspot.com/10447017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139521 0039d316-1c4b-4281-b951-d872f2087c98
* Move chromeos::GetInterfacesFromIntrospectResult into IntrospectableClienthashimoto@chromium.org2012-05-3010-80/+51
| | | | | | | | | | | | Since XmlReader was moved from chrome/ to third_party/libxml/, now chromeos/ can depend on it. BUG=119583 TEST=chromeos_unittests Review URL: https://chromiumcodereview.appspot.com/10440013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139520 0039d316-1c4b-4281-b951-d872f2087c98
* Disable RecordApiTest.CheckPlayback under ASanglider@chromium.org2012-05-301-1/+7
| | | | | | | | TBR=clintstaley BUG=130267 Review URL: https://chromiumcodereview.appspot.com/10448072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139519 0039d316-1c4b-4281-b951-d872f2087c98
* Fix memory leak in V8ValueConverterImpl that I just introduced.kalman@chromium.org2012-05-301-5/+5
| | | | | | | | | TBR=jam@chromium.org BUG=129411 Review URL: https://chromiumcodereview.appspot.com/10442082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139518 0039d316-1c4b-4281-b951-d872f2087c98
* Re-apply 139321 - JNI Generator: removes obsolete -p option.bulach@chromium.org2012-05-301-9/+5
| | | | | | | | | | | | | | | | | Following: https://chromiumcodereview.appspot.com/10414057 We're unpacking the .class file directly from the .jar, no need for a -p option anymore. (re-applies after 139338) BUG= TEST= TBR=rlp@chromium.org Review URL: https://chromiumcodereview.appspot.com/10440086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139517 0039d316-1c4b-4281-b951-d872f2087c98
* Very minor typo fixes for GData/FileAPI code.kinaba@chromium.org2012-05-309-20/+20
| | | | | | | | | | BUG=None TEST=None. Just changing comments and spaces. Review URL: https://chromiumcodereview.appspot.com/10441086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139516 0039d316-1c4b-4281-b951-d872f2087c98
* Add the target ABI option for apk based test runneryongsheng.zhu@intel.com2012-05-303-3/+10
| | | | | | | | | | | | | | Remove the hardcode directory name 'armeabi' and replace it with the Android target ABI information. Trivial gyp changes that are android-specific; TBRing some owners TBR=mark@chromium.org,jam@chromium.org,sky@chromium.org BUG=128944 TEST= Review URL: https://chromiumcodereview.appspot.com/10383263 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139512 0039d316-1c4b-4281-b951-d872f2087c98
* Add preview and more prefs to the font settings sample extension.falken@google.com2012-05-306-43/+116
| | | | | | | | | BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10453052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139511 0039d316-1c4b-4281-b951-d872f2087c98
* Allow "null" to mean optional in extension APIs (for realz), but normalise itkalman@chromium.org2012-05-307-7/+85
| | | | | | | | | | | | | | | | | | for browser implementations by stripping it from objects. The following are all now exactly the same, where previously they weren't and would either not work or crash the browser/renderer: chrome.tabs.create({}); chrome.tabs.create({windowId: undefined}); chrome.tabs.create({windowId: null}); BUG=129411 TEST=as in bug Review URL: https://chromiumcodereview.appspot.com/10456010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139510 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for response header manipulation in Declarative WebRequest APIbattre@chromium.org2012-05-3015-43/+561
| | | | | | | | | | BUG=112155 TEST=no Review URL: https://chromiumcodereview.appspot.com/10451071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139509 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Make InvalidationNotifier use PushClientakalin@chromium.org2012-05-3021-492/+594
| | | | | | | | | | | | | | | | | | | This removes a lot of duplicated code and unifies the two main SyncNotifier implementations (P2P and Invalidation) to use the same underlying transport layer. Replace CacheInvalidationPacketHandler and ChromeNetwork with PushClientChannel. Add PushClient::CreateDefaultOnIOThread which creates an XmppPushClient directly. BUG=76764 TEST= Review URL: https://chromiumcodereview.appspot.com/10436013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139508 0039d316-1c4b-4281-b951-d872f2087c98
* Enables aynchronous spellchecking by default on Win, Linux, and Chrome OS ↵hbono@chromium.org2012-05-305-18/+24
| | | | | | | | | | | | | (Take 2) This change replaces '--enable-asynchronous-spellchecking' with '--disable-asynchronous-spellchecking' so we can enable this feature by default on Windows, Linux, and Chrome OS again. (This feature is still disabled on Mac until I can implement this new spellchecker interface for Mac so it can use NSSpellChecker.) BUG=107371 TEST=none Review URL: https://chromiumcodereview.appspot.com/10454048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139506 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139472 - Revert 139404 - ash: Allow pinch gestures to resize the window.kinuko@chromium.org2012-05-303-18/+78
| | | | | | | | | | | | | | | | | 139398 is suspected to windows browser_builds. BUG=121140 TEST=none Review URL: https://chromiumcodereview.appspot.com/10454045 TBR=sadrul@chromium.org Review URL: https://chromiumcodereview.appspot.com/10456023 TBR=kinuko@chromium.org Review URL: https://chromiumcodereview.appspot.com/10443078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139505 0039d316-1c4b-4281-b951-d872f2087c98
* Updating trunk VERSION from 1156.0 to 1157.0chrome-release@google.com2012-05-301-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139504 0039d316-1c4b-4281-b951-d872f2087c98
* Remove logspam from media_unittests.fischman@chromium.org2012-05-302-5/+11
| | | | | | Review URL: https://chromiumcodereview.appspot.com/10458007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139503 0039d316-1c4b-4281-b951-d872f2087c98
* Changes name of parameter from attributeFlags to attribute_flags.khorimoto@chromium.org2012-05-302-14/+12
| | | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10443063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139501 0039d316-1c4b-4281-b951-d872f2087c98
* Suppress leak in OneClickSigininHelperTestoshima@chromium.org2012-05-302-0/+28
| | | | | | | | | | | TBR=rogerta@chromium.org BUG=130246 TEST=none NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10453073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139500 0039d316-1c4b-4281-b951-d872f2087c98
* aura: Do not send unknown gesture events to webkit.sadrul@chromium.org2012-05-302-1/+5
| | | | | | | | | | | | | | Do not send gesture-events that webkit doesn't know about to webkit (e.g. tap-up, multifinger-swipe). BUG=121140 TEST=none TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10446077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139499 0039d316-1c4b-4281-b951-d872f2087c98
* Move fileapi into its own componentbenwells@chromium.org2012-05-3041-104/+178
| | | | | | | | | | | | Before this change fileapi is a static library. As it has static data, this causes problems when used from multiple components like chrome and content. BUG=129885 TEST=Existing tests Review URL: https://chromiumcodereview.appspot.com/10447055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139498 0039d316-1c4b-4281-b951-d872f2087c98
* Add net, content and ipc to the default list of APK test bundles.nileshagrawal@chromium.org2012-05-304-1/+7
| | | | | | | | | | | | | | These APK bundles are compiled and run on the android_test try bot. Test run: http://build.chromium.org/p/tryserver.chromium/builders/android_test/builds/117 All tests pass. BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10447050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139497 0039d316-1c4b-4281-b951-d872f2087c98
* ash/app_list: Handle shelf left/right dock.xiyuan@chromium.org2012-05-3010-80/+311
| | | | | | | | | | | | And update the app list bubble border/shadow. BUG=130114 TEST=Dock ash launcher bar to left/right and check app list bubble is properly aligned with it. Review URL: https://chromiumcodereview.appspot.com/10454063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139496 0039d316-1c4b-4281-b951-d872f2087c98
* Delete Pipeline::GetBufferedBytes() in preparation for didLoadingProgress() ↵fischman@chromium.org2012-05-305-20/+42
| | | | | | | | | | | switchover. BUG=http://webk.it/86113 Review URL: https://chromiumcodereview.appspot.com/10458005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139495 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Improved window maximize/restore animationsjamescook@chromium.org2012-05-3023-56/+376
| | | | | | | | | | | | | | | | | | This implements a cross-fade while scaling the window between the new and old size. When a maximize animation is triggered we grab the window's current layer (and those of child windows) and start an animation on those layers to scale them up to full size. Simultaneously, we install a fresh layer for the window, set the bounds to fill the workspace, and tell the window to paint. We scale down that layer to match the window size at the start of the animation, then fade it in while scaling it up to full size. The restore animation essentially does the above in reverse. However, we always keep the higher resolution layer on top (it looks better), and we always keep the lower layer fully opaque (so the desktop doesn't bleed through). The animation is aborted if the window is closed mid-animation or the GPU process crashes mid-animation. BUG=116618 TEST=aura_shell_unittests WorkspaceManagerTest and WindowAnimationsTest, trigger slow window animation with control-shift-click on maximize widget and close window during animation, kill -9 the GPU process during the animation and observe that Chrome recovers Review URL: https://chromiumcodereview.appspot.com/10444014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139494 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup the URLRequestContext after finishing communication with test ↵jnd@chromium.org2012-05-302-0/+8
| | | | | | | | | | | | | | | sserver spawner. URLRequestContext was a Ref-Countable before, I used to track it by using scoped_refptr<> wrapper, so when the relevant URLRequest is gone, the corresponding URLRequestContext gets destroyed at same time on same thread. But after change crrev.com/136497, URLRequestContext is no longer Ref-Countable, so it is not gone with the associated URLRequest, we have to manually reset it. Some net tests on Android were failed due to the DCHECK of freeing URLRequestContext on another thread. Also invalidate the weak pointers on the IO thread when the request gets completed. BUG=None TEST=net test based tests on Android should pass. Review URL: https://chromiumcodereview.appspot.com/10456013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139493 0039d316-1c4b-4281-b951-d872f2087c98
* Uber: Fix font in sidebar -- shouldn't be DejaVu on Mac.dubroy@chromium.org2012-05-301-1/+1
| | | | | | | | | | BUG=129136 TEST=Visual inspection Review URL: https://chromiumcodereview.appspot.com/10408055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139492 0039d316-1c4b-4281-b951-d872f2087c98
* [Chromoting] Updated Mac installer using Packages.garykac@chromium.org2012-05-303-0/+2226
| | | | | | | | | | | | | These files are not currently being used. We need to wait for an updated Keystone .pkg before we can switch to using them. BUG=127267 TEST=none Review URL: https://chromiumcodereview.appspot.com/10453069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139491 0039d316-1c4b-4281-b951-d872f2087c98
* sync: fix and enable InvalidationNotifierTest.Basictim@chromium.org2012-05-301-8/+2
| | | | | | | | | | BUG=119467 TEST=InvalidationNotifierTest.Basic Review URL: https://chromiumcodereview.appspot.com/10446073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139490 0039d316-1c4b-4281-b951-d872f2087c98
* Allow specification of minimum size for app windows on creation.jeremya@chromium.org2012-05-305-3/+29
| | | | | | | | | | | | Currently only has an effect on windows. BUG=129962 R=mihaip@chromium.org Review URL: https://chromiumcodereview.appspot.com/10444045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139489 0039d316-1c4b-4281-b951-d872f2087c98
* Return NOT_IMPLEMENTED on unsupported OSes.jamiewalch@chromium.org2012-05-302-0/+7
| | | | | | | | | | BUG=130149 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/10441083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139488 0039d316-1c4b-4281-b951-d872f2087c98
* Make ScriptBadgeExecutor only show extension script badges after they'rekalman@chromium.org2012-05-3014-44/+166
| | | | | | | | | | | | | | | | | definitely running, and for frames within pages (i.e. show a badge on foo.com if it has a bar.com iframe with a content script running on it). Achieve this by (1) only showing for executeScript when the response comes with the correct URL, and (2) only showing for content scripts when the renderer informs the browser that the script is running. BUG=127988 Review URL: https://chromiumcodereview.appspot.com/10446054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139487 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139473 - Revert 139398 - gesture recognizer: Allow multi-finger ↵kinuko@chromium.org2012-05-3011-447/+401
| | | | | | | | | | | | | | | | | | | | | pinch/scroll gestures. Instead of having specific X-finger gestures (e.g. three-finger swipe, two-finger pinch), add support for gestures with a variable number of fingers (e.g. two-finger pinch and three-finger pinch etc.) BUG=121140 TEST=none Review URL: https://chromiumcodereview.appspot.com/10137010 TBR=sadrul@chromium.org Review URL: https://chromiumcodereview.appspot.com/10449065 TBR=kinuko@chromium.org Review URL: https://chromiumcodereview.appspot.com/10454068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139486 0039d316-1c4b-4281-b951-d872f2087c98
* Add APK targets for gpu_unittests.nileshagrawal@chromium.org2012-05-301-2/+30
| | | | | | | | | | | | | | | Removing dependency on testing/gmock.gyp:gmock_main as we have our own main in command_buffer/common/unittest_main.cc BUG=125059 Follow-up to: http://codereview.chromium.org/10399126/ TEST= Review URL: https://chromiumcodereview.appspot.com/10459017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139485 0039d316-1c4b-4281-b951-d872f2087c98
* gdata: Fix a crash in case of authentication failure.hshi@chromium.org2012-05-301-3/+8
| | | | | | | | | | | | | | | | | | | UrlFetchOperationBase::OnAuthFailed should notify authentication failure before calling NotifyFinish(). GDataOperationRegistry::Operation::NotifyFinish() should always be the very last call, after all other notify and callback calls. This is because it calls GDataOperationRegistry::OnOperationFinish which deletes the operation itself. BUG=129487 TEST=lumpy Review URL: https://chromiumcodereview.appspot.com/10458017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139484 0039d316-1c4b-4281-b951-d872f2087c98
* Disable testChromoting on all platformsnirnimesh@chromium.org2012-05-301-0/+2
| | | | | | | | | | | | Broken by r139424 TBR=sergeyu@chromium.org BUG=130252 TEST= Review URL: https://chromiumcodereview.appspot.com/10451077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139483 0039d316-1c4b-4281-b951-d872f2087c98
* Reused target.vitalybuka@chromium.org2012-05-301-9/+1
| | | | | | | | | | BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10458019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139482 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl Validation Caching: support incognito mode.ncbray@chromium.org2012-05-309-34/+73
| | | | | | | | | | | | | | | | | | | | | | When the validation cache handles a query from an incognito process it: 1) checks the main cache without reordering it. 2) if 1 fails, checks a seperate "incognito" cache that is never persisted to disk. When the validation cache handles a set from incognito process, it routes the set directly to the incognito cache. The net result is that incognito can use non-incognito cache entries, and cache entries created in incognito mode are only usable by incognito within a single browser session. BUG= http://code.google.com/p/nativeclient/issues/detail?id=2515 TEST= Run nexe in browser with NACL_VALIDATION_CACHE=1 Review URL: https://chromiumcodereview.appspot.com/10446047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139481 0039d316-1c4b-4281-b951-d872f2087c98
* validate CHROME_SRC setting to avoid confusionjames.wei@intel.com2012-05-302-1/+12
| | | | | | | | | | BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10409048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139480 0039d316-1c4b-4281-b951-d872f2087c98
* DEADCODE in #if'ed code.scr@chromium.org2012-05-301-4/+4
| | | | | | | | | | | CID=102985 BUG=None TEST= Review URL: https://chromiumcodereview.appspot.com/10459021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139479 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2012-05-301-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139478 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139469 - Revert 139399 - Roll webkit revision to 118816kinuko@chromium.org2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | Is suspected to break Windows unit_tests. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10447070 TBR=rafaelw@chromium.org Review URL: https://chromiumcodereview.appspot.com/10441085 TBR=kinuko@chromium.org Review URL: https://chromiumcodereview.appspot.com/10446078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139477 0039d316-1c4b-4281-b951-d872f2087c98
* Modify Browser::IsReservedCommandOrKey() to make sure it returns false when ↵yusukes@chromium.org2012-05-302-4/+22
| | | | | | | | | | | | an Ash shortcut is pressed. BUG=129978,123856 TEST=ran unit_tests + manual test. Review URL: https://chromiumcodereview.appspot.com/10444047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139476 0039d316-1c4b-4281-b951-d872f2087c98
* Asynchronously launch the GPU process as soon as the IO thread is ready.apatrick@chromium.org2012-05-306-15/+49
| | | | | | | | When the first tab is composited, this results in the GPU process being initialized about 100ms earlier on my box. Review URL: https://chromiumcodereview.appspot.com/10445002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139475 0039d316-1c4b-4281-b951-d872f2087c98
* Convert get_native_path_case() to only accept absolute path.maruel@chromium.org2012-05-301-17/+54
| | | | | | | | | | | | | | | This makes the logic more consistent and the function more efficient. Makes isabs() more accomoding with bare drive path. R=mad@chromium.org BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10456002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139474 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139398 - gesture recognizer: Allow multi-finger pinch/scroll gestures.kinuko@chromium.org2012-05-3011-401/+447
| | | | | | | | | | | | | | | | Instead of having specific X-finger gestures (e.g. three-finger swipe, two-finger pinch), add support for gestures with a variable number of fingers (e.g. two-finger pinch and three-finger pinch etc.) BUG=121140 TEST=none Review URL: https://chromiumcodereview.appspot.com/10137010 TBR=sadrul@chromium.org Review URL: https://chromiumcodereview.appspot.com/10449065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139473 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139404 - ash: Allow pinch gestures to resize the window.kinuko@chromium.org2012-05-303-78/+18
| | | | | | | | | | | | | | 139398 is suspected to windows browser_builds. BUG=121140 TEST=none Review URL: https://chromiumcodereview.appspot.com/10454045 TBR=sadrul@chromium.org Review URL: https://chromiumcodereview.appspot.com/10456023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139472 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2012-05-301-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139470 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 139399 - Roll webkit revision to 118816kinuko@chromium.org2012-05-301-1/+1
| | | | | | | | | | | | | | | Is suspected to break Windows unit_tests. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10447070 TBR=rafaelw@chromium.org Review URL: https://chromiumcodereview.appspot.com/10441085 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139469 0039d316-1c4b-4281-b951-d872f2087c98