- 28 Apr, 2014 40 commits
-
-
mpearson@chromium.org authored
Previously we'd match the omnibox input against a cleaned-up version of the URL. Precisely, we'd remove the escaping and interpret as UTF8 (and lower-case it) so non-Latin characters can be matched correctly. This is all well and good, but then we'd take the offsets of those matches and use them to highlight segments of the original URL (properly escaped). Oops. At best this caused bad highlighting; at middle, it caused weirdness as we attempted to highlight the middle of a multi-string character; at worst, it'd cause crashes because our offsets calculation would put us in no-man's-land. This fixes all that. :-) Precisely, we keep track of the adjustments made during cleaning. We take the offsets where terms matched and apply them through the transformation in reverse. TBR=sky (as usual for history and bookmarks stuff that just change internals relative to how they behave with the omnibox) BUG=252630,359270 Review URL: https://codereview.chromium.org/255423002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266630 0039d316-1c4b-4281-b951-d872f2087c98
-
simonhatch@chromium.org authored
Added a new --bisect_mode flag to the script that allows the bisect to go off changes in mean, standard deviation, or return code. Bisecting off standard deviation may be helpful in identifying situations where the amount of noise in a test has increased. Bisecting return codes will help track down functional breakages. NOTRY=true BUG=366713 Example output: Bisect could not reproduce a change in the out/out metric. Confidence in Bisection Results: 0% To reproduce locally: $ echo RESULT out: out= 0 ms Tested commits: Depot Commit SHA Std. Dev Mean State chromium 50845b603a3faeb56d7f531c8a2b9a7030ae63c2 +-0.00 0.00 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265006 +-0.00 0.00 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265005 +-0.00 0.00 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265004 +-0.00 0.00 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265003 +-0.00 0.00 Average build time : 0:00:00 Average test time : 0:00:00 Bisect could not reproduce a change in the return code. Confidence in Bisection Results: 0% To reproduce locally: $ echo RESULT out: out= 0 ms Tested commits: Depot Commit SHA Return Code State chromium 50845b603a3faeb56d7f531c8a2b9a7030ae63c2 0 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265006 0 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265005 0 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265004 0 chromium http://src.chromium.org/viewvc/chrome?view=revision&revision=265003 0 Average build time : 0:00:00 Average test time : 0:00:00 Review URL: https://codereview.chromium.org/255943002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266629 0039d316-1c4b-4281-b951-d872f2087c98
-
sadrul@chromium.org authored
If Quit() is called on the message-pump to terminate a nested loop, followed by a call to Run() again to start another nested loop, in the same iteration of the loop, then make sure it all works correctly. We have this scenario with nested menus, modal dialogs, drag-drop etc. in the browser UI. So this is a prerequisite fix to be able to use the libevent based message-pump on Chrome OS (and get rid of glib dep). BUG=240715 R=sky@chromium.org TBR=darin@chromium.org Review URL: https://codereview.chromium.org/245923005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266628 0039d316-1c4b-4281-b951-d872f2087c98
-
binji@chromium.org authored
BUG=none R=bradnelson@google.com, bradnelson@chromium.org Review URL: https://codereview.chromium.org/250773010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266627 0039d316-1c4b-4281-b951-d872f2087c98
-
skyostil@chromium.org authored
Split impl-side animating and drawing into separate actions. This is needed to allow for the possibility of a commit between animating and drawing so that the main thread gets a chance to consume the new animation state. In particular this allows the main thread to synchronize with a fling animation using an onscroll handler. BUG=347366 Review URL: https://codereview.chromium.org/206793003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266624 0039d316-1c4b-4281-b951-d872f2087c98
-
estade@chromium.org authored
```------------------- Automatically call OnNativeThemeChanged when a widget is added to a hierarchy with a widget. Split off from https://codereview.chromium.org/245863002/ BUG=347832 (tangentially) ``` ------------------- original review: https://codereview.chromium.org/248073005/ changes: updated views unit tests R=sky@chromium.org Review URL: https://codereview.chromium.org/251703002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266622 0039d316-1c4b-4281-b951-d872f2087c98
-
davidben@chromium.org authored
Causing problems with a pending change in Blink. BUG=367271 Review URL: https://codereview.chromium.org/250953005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266621 0039d316-1c4b-4281-b951-d872f2087c98
-
eroman@chromium.org authored
This corresponds with the WebCrypto spec update: https://dvcs.w3.org/hg/webcrypto-api/rev/64993be45f9f And is a dependency for the Blink change: https://codereview.chromium.org/243853004/ BUG=245025 Review URL: https://codereview.chromium.org/243433006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266620 0039d316-1c4b-4281-b951-d872f2087c98
-
achuith@chromium.org authored
BUG=358728 TEST=Manual NOTRY=True Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266051 Review URL: https://codereview.chromium.org/246353004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266619 0039d316-1c4b-4281-b951-d872f2087c98
-
mdempsky@chromium.org authored
BUG=357670 NOTRY=true Review URL: https://codereview.chromium.org/258893004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266618 0039d316-1c4b-4281-b951-d872f2087c98
-
ben@chromium.org authored
Several tests are using AuraTestHelper and were relying on it to set up the DefaultActivationClient, so I had to have them instantiate the DAC directly after calling SetUp() on the helper. I also had to make the DAC delete itself after the root window it's bound to is destroyed. R=sky@chromium.org http://crbug.com/308710 Review URL: https://codereview.chromium.org/250113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266616 0039d316-1c4b-4281-b951-d872f2087c98
-
caitkp@chromium.org authored
Store default search provider data in dictionary pref, and add DefaultSearchManager class to handle the reading and writing of this pref (DefaultSearchManager will eventually all default search related concerns). This pref will be used to persist data about user-selected default search providers. In future CLs, support will be added for default search providers set by policy and sync. BUG=365762 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266479 Review URL: https://codereview.chromium.org/229763005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266615 0039d316-1c4b-4281-b951-d872f2087c98
-
robliao@chromium.org authored
TBR=ajwong@chromium.org Review URL: https://codereview.chromium.org/259093002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266614 0039d316-1c4b-4281-b951-d872f2087c98
-
lambroslambrou@chromium.org authored
This adds /etc/chrome-remote-desktop-session to the list of files that the script looks for when deciding what session to start. BUG=366759 NOTRY=true Review URL: https://codereview.chromium.org/254393003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266613 0039d316-1c4b-4281-b951-d872f2087c98
-
chrome-admin@google.com authored
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266612 0039d316-1c4b-4281-b951-d872f2087c98
-
eseidel@chromium.org authored
http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog_blink.html?url=/trunk&range=172758:172770&mode=html TBR= BUG= Review URL: https://codereview.chromium.org/250923015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266611 0039d316-1c4b-4281-b951-d872f2087c98
-
thakis@chromium.org authored
Revert of Touch emulator: overwrite timestamps from mouse event with current time. (https://codereview.chromium.org/250923005/) Reason for revert: Somewhat speculative; looks like this caused TouchEmulatorTest failures on valgrind: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28tsan%29%283%29/builds/11052 TouchEmulatorTest.Pinch: ../../content/browser/renderer_host/input/touch_emulator_unittest.cc:254: Failure Value of: ExpectedEvents() Actual: "TouchEnd GestureFlingStart" Expected: "TouchEnd GestureScrollEnd" etc Original issue's description: > Touch emulator: overwrite timestamps from mouse event with current time. > > On some platfroms, mouse events come with a bad timestamp, which leads to > awkward time-dependent gestures. For example, fling animation may be almost > instant. > Using base::TimeTicks::Now() is good enough for emulation purposes, because > emulator spawns new events itself. > > BUG=367156 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266548 TBR=jdduke@chromium.org,dgozman@chromium.org NOTREECHECKS=true NOTRY=true BUG=367156 Review URL: https://codereview.chromium.org/252963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266610 0039d316-1c4b-4281-b951-d872f2087c98
-
thakis@chromium.org authored
Revert of Revert of Remove smiluate-touch-screen-with-mouse content flag. (https://codereview.chromium.org/260123003/) Reason for revert: I meant to revert https://codereview.chromium.org/250923005/ , not this one. Original issue's description: > Revert of Remove smiluate-touch-screen-with-mouse content flag. (https://codereview.chromium.org/258503003/) > > Reason for revert: > Somewhat speculative; looks like this caused TouchEmulatorTest failures on valgrind: > > http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28tsan%29%283%29/builds/11052 > > TouchEmulatorTest.Pinch: > ../../content/browser/renderer_host/input/touch_emulator_unittest.cc:254: Failure > Value of: ExpectedEvents() > Actual: "TouchEnd GestureFlingStart" > Expected: "TouchEnd GestureScrollEnd" > > etc > > Original issue's description: > > Remove smiluate-touch-screen-with-mouse content flag. > > > > This is duplicated functionality now, as one can use DevTools touch emulation instead. > > > > BUG=337142 > > > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266549 > > TBR=aelias@chromium.org,jochen@chromium.org,dgozman@chromium.org > NOTREECHECKS=true > NOTRY=true > BUG=337142 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266608 TBR=aelias@chromium.org,jochen@chromium.org,dgozman@chromium.org NOTREECHECKS=true NOTRY=true BUG=337142 Review URL: https://codereview.chromium.org/256203003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266609 0039d316-1c4b-4281-b951-d872f2087c98
-
thakis@chromium.org authored
Revert of Remove smiluate-touch-screen-with-mouse content flag. (https://codereview.chromium.org/258503003/) Reason for revert: Somewhat speculative; looks like this caused TouchEmulatorTest failures on valgrind: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28tsan%29%283%29/builds/11052 TouchEmulatorTest.Pinch: ../../content/browser/renderer_host/input/touch_emulator_unittest.cc:254: Failure Value of: ExpectedEvents() Actual: "TouchEnd GestureFlingStart" Expected: "TouchEnd GestureScrollEnd" etc Original issue's description: > Remove smiluate-touch-screen-with-mouse content flag. > > This is duplicated functionality now, as one can use DevTools touch emulation instead. > > BUG=337142 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266549 TBR=aelias@chromium.org,jochen@chromium.org,dgozman@chromium.org NOTREECHECKS=true NOTRY=true BUG=337142 Review URL: https://codereview.chromium.org/260123003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266608 0039d316-1c4b-4281-b951-d872f2087c98
-
eseidel@chromium.org authored
Revert of Prepare browser_tests for data: urls being async (https://codereview.chromium.org/257723002/) Reason for revert: This didn't fully solve the issue, no need to add the complexity. Original issue's description: > Prepare browser_tests for data: urls being async > > RenderViewTest::LoadHTML assumed that issuing a load > of a data url, posting a task to quit the message loop > and then pumping the message loop until it quits was > sufficient to end up with a fully parsed page. > > That very soon won't be true once we send data: urls > to the threaded parser, as the parser thread posts > back to the main thread and may post tasks after the > quit message. > https://codereview.chromium.org/210253003/ > > Instead I've added a FrameLoadWaiter class which > implements RenderViewObserver to listen for the > load event for the frame and only post the quit > task once the load event had come in. > > BUG=308321 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266163 TBR=abarth@chromium.org,sky@chromium.org NOTREECHECKS=true NOTRY=true BUG=308321 Review URL: https://codereview.chromium.org/252743006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266607 0039d316-1c4b-4281-b951-d872f2087c98
-
vollick@chromium.org authored
It's semantically more correct. R=danakj@chromium.org BUG=None Review URL: https://codereview.chromium.org/256773003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266606 0039d316-1c4b-4281-b951-d872f2087c98
-
alekseys@chromium.org authored
Calculate an expected number of visible destinations more accurately to prevent extra (and unnecessary) destination search window resize. In some cases, since select control dropdown is not moved along with the control, close the select element on destination select window resize to keep UI consistent. BUG=363557 Review URL: https://codereview.chromium.org/259873002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266604 0039d316-1c4b-4281-b951-d872f2087c98
-
stevet@chromium.org authored
BUG=367758 Review URL: https://codereview.chromium.org/251113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266600 0039d316-1c4b-4281-b951-d872f2087c98
-
ajwong@chromium.org authored
Doing this per request from matthewyuan. B=367506 > Extend DOMActivityLogger interface for upcoming change > > In order to reduce pain (hopefully to zero) for sheriffs and fellow developers > who prefer their trees green rather than red, let's make landing the change > at https://codereview.chromium.org/213783002/ as safe as possible. > > Step 1: This CL. Extend DOMActivityLogger with new methods for logGetter, > logSetter, and logMethod, which have the same functionality as the current > log() method. > Step 2: https://codereview.chromium.org/213783002/ - The implementation change > in blink to switch from using log() to using logX. > Step 3: Cleanup -- remove old log method from chrome. > > BUG=356890 > > Review URL: https://codereview.chromium.org/247953008 TBR=rdevlin.cronin@chromium.org Review URL: https://codereview.chromium.org/259003005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266599 0039d316-1c4b-4281-b951-d872f2087c98
-
jam@chromium.org authored
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266598 0039d316-1c4b-4281-b951-d872f2087c98
-
tim@chromium.org authored
This is a step towards changing SCP's dependency on ProfileSyncComponentsFactory to SyncApiComponentsFactory. This method was used exclusively for testing unlike other S.A.C.F methods which serve a production code purpose. Moreover, I found that most tests didn't actually need a SharedChangeProcessorMock yet its presence (especially when considered with CreateGenericChangeProcessor) made things more complicated, so I removed it from everywhere except NonUIDataTypeControllerTest. BUG=339726 R=haitaol@chromium.org, maniscalco@chromium.org Review URL: https://codereview.chromium.org/247433004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266597 0039d316-1c4b-4281-b951-d872f2087c98
-
bartfab@chromium.org authored
This CL further reduces TiclInvalidationService's dependency on Profile. Instead of TiclInvalidationService accessing the GCMProfileServiceFactory, it is now given an GCMService as an explicit dependency. BUG=362083 TEST=Updated unit tests Review URL: https://codereview.chromium.org/238983007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266596 0039d316-1c4b-4281-b951-d872f2087c98
-
rlarocque@chromium.org authored
The label "changes remaining" is not quite correct. It's actually set to either zero or one, depending on whether or not the current sync cycle should result in more downloads. If there is an issue with infinite download looping, we should be able to detect and debug it based on the protocol logs, among other things. The protocol logs indicate when a GetUpdates response had a non-zero "changes remaining" value. BUG=349301 Review URL: https://codereview.chromium.org/256413007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266594 0039d316-1c4b-4281-b951-d872f2087c98
-
beaudoin@chromium.org authored
This is a temporary fix to unbreak clank while they remove their dependency on that method. BUG=367832 TBR=pkasting@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/252913002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266592 0039d316-1c4b-4281-b951-d872f2087c98
-
mlamouri@chromium.org authored
BUG=162827 NOTRY=true Review URL: https://codereview.chromium.org/254563004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266591 0039d316-1c4b-4281-b951-d872f2087c98
-
jam@chromium.org authored
Fix for the revert of Blink r172659. The problem was that MediaStreamImpl's constructor was getting a RenderView with an uninitialized routing_id. Also add a dcheck to catch this happening in the future to make debugging easier. BUG=304341 R=nasko@chromium.org Review URL: https://codereview.chromium.org/259973002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266588 0039d316-1c4b-4281-b951-d872f2087c98
-
skyostil@chromium.org authored
NOTRY=True Review URL: https://codereview.chromium.org/254803013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266587 0039d316-1c4b-4281-b951-d872f2087c98
-
yusufo@chromium.org authored
BUG=360664 Review URL: https://codereview.chromium.org/252623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266586 0039d316-1c4b-4281-b951-d872f2087c98
-
jdduke@chromium.org authored
The patch landed originally in r266470, but was reverted in r266579 due to an uninitialized variable. The fix was reviewed in crrev.com/253813003. This implements a touch dispatch model in which touchmove sending is throttled while a scroll sequence is active and being consumed. Such touchmove's are marked with |cancelable = false|, indicating to any potential consumers that the event cannot be prevented from triggering a platform gesture. Throttling limits the touchmove sending rate during scrolling to 1 event per 200ms. BUG=346693,367692 NOTRY=true TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/254803012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266585 0039d316-1c4b-4281-b951-d872f2087c98
-
glider@chromium.org authored
Remove the ignore file entry for _M_rep races which previously helped avoid deadlocks in TSan. The recent Clang roll has brought the TSan fix to Chromium. BUG=356676 TBR=thakis@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/258053002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266584 0039d316-1c4b-4281-b951-d872f2087c98
-
jiayl@chromium.org authored
BUG=366288 Review URL: https://codereview.chromium.org/252393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266583 0039d316-1c4b-4281-b951-d872f2087c98
-
thakis@chromium.org authored
Revert of Limit renderer saved frames to avoid running out of fds. (https://codereview.chromium.org/248193003/) Reason for revert: Somewhat speculative. SoftwareFrameManagerTest.DoNotEvictVisible started failing reliably on the valgrind bots after this landed. Example: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%283%29/builds/32121/steps/memory%20test%3A%20content/logs/SoftwareFrameManagerTest.DoNotEvictVisible http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20OS%20%28valgrind%29%283%29/builds/32121/steps/memory%20test%3A%20content/logs/SoftwareFrameManagerTest.DoNotEvictVisible Original issue's description: > Limit renderer saved frames to avoid running out of fds. > > Software delegated rendering uses one fd per tile, so with a bunch of tiles that means it can run out of fds. If it seems close to hitting the limit the browser should throw away old frames to avoid this from happening. > > BUG=362603 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266383 TBR=piman@chromium.org,jbauman@chromium.org NOTREECHECKS=true NOTRY=true BUG=362603 Review URL: https://codereview.chromium.org/258093002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266582 0039d316-1c4b-4281-b951-d872f2087c98
-
thakis@chromium.org authored
valgrind reports uninitialized memory usage: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/33440/steps/memory%20test%3A%20content/logs/AD4CE3561F03B37F fun:_ZN7content15TouchEventQueue25SendTouchEventImmediatelyERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content15TouchEventQueue26ForwardNextEventToRendererEv fun:_ZN7content15TouchEventQueue10QueueEventERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content19TouchEventQueueTest14SendTouchEventERKN5blink13WebTouchEventE fun:_ZN7content19TouchEventQueueTest14SendTouchEventEv fun:_ZN7content19TouchEventQueueTest15PressTouchPointEff fun:_ZN7content30TouchEventQueueTest_Basic_Test8TestBodyEv http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/33440/steps/memory%20test%3A%20content/logs/383BD397F91FBC46 fun:_ZN7content15TouchEventQueue25SendTouchEventImmediatelyERKNS_20EventWithLatencyInfoIN5blink13WebTouchEventEEE fun:_ZN7content15TouchEventQueue19TouchTimeoutHandler17ConfirmTouchEventENS_18InputEventAckStateE fun:_ZN7content15TouchEventQueue15ProcessTouchAckENS_18InputEventAckStateERKN2ui11LatencyInfoE fun:_ZN7content19TouchEventQueueTest17SendTouchEventAckENS_18InputEventAckStateE fun:_ZN7content42TouchEventQueueTest_TouchTimeoutBasic_Test8TestBodyEv etc > Implement async touchmove dispatch during scroll > > This implements a touch dispatch model in which touchmove sending is throttled > while a scroll sequence is active and being consumed. Such touchmove's are > marked with |cancelable = false|, indicating to any potential consumers that the > event cannot be prevented from triggering a platform gesture. Throttling limits > the touchmove sending rate during scrolling to 1 event per 200ms. > > BUG=346693 > > Review URL: https://codereview.chromium.org/245833002 TBR=jdduke@chromium.org Review URL: https://codereview.chromium.org/252023005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266579 0039d316-1c4b-4281-b951-d872f2087c98
-
chrome-admin@google.com authored
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266578 0039d316-1c4b-4281-b951-d872f2087c98
-
eseidel@chromium.org authored
http://build.chromium.org/f/chromium/perf/dashboard/ui/changelog_blink.html?url=/trunk&range=172734:172758&mode=html TBR= BUG= Review URL: https://codereview.chromium.org/259823010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266577 0039d316-1c4b-4281-b951-d872f2087c98
-