summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix flags for ARM GN build.brettw@chromium.org2014-01-151-2/+2
| | | | | | | | | | I accidentally used underscores which gives undefined option errors. TBR=scottmg Review URL: https://codereview.chromium.org/135733005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244838 0039d316-1c4b-4281-b951-d872f2087c98
* Timeline cleanups for silk measurementnduca@chromium.org2014-01-1514-129/+345
| | | | | | | | | | | | | | | | | | | | The main point of this is to add some basic features into silk measurement: - Split the silk measurement out to its own thing - Add detailed reporting of where time goes on the render thread But, in support of this, I added much-needed test coverage: - Move timeline options from construction time to properties to reduce amount of glue code - Add smoke test coverage for the timeline-based metrics - Add unit test of ThreadTimesTimelineMetric that uses pure timeline instead of full data - Split some functions out of ThreadTimesTimelineMetric loop allow more drop in features - Allow Timeline to be finalized outside of ImportEvents for use by unit tests that hand-construct timelines R=ernstm,tonyg BUG=332447,332442 Review URL: https://codereview.chromium.org/111013003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244837 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent stall of text cues by selecting next range elementmatthewjheaney@chromium.org2014-01-154-50/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | The source buffer stream (part of the implementation of the Media Source API) caches buffers in ranges, each corresponding to some contiguous span of time. Text cues are discontiguous (by their nature), and as cues are appended to the source buffer stream, it creates a new range element, into which the remaining text cues are inserted. As buffers are pulled downstream, the first range becomes exhausted, but instead of moving to the next range, the stream signals "need more data", and hence there's a stall, and no more cues are rendered. But this is not correct, as the source buffer stream already holds all the data (in the next range element). The solution here is liberalize BelongsToRange to return true for text streams, which should prevent the creation of any new range elements beyond the first (only) one. BUG=230708 Review URL: https://codereview.chromium.org/108073004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244836 0039d316-1c4b-4281-b951-d872f2087c98
* Use a single ToplevelWindowEventHandler for the ash::Shell. This is part 1 ↵pkotwicz@chromium.org2014-01-1517-120/+97
| | | | | | | | | | | | | | in disabling the few cases in which dragging multiple windows is possible (which causes crashiness) BUG=324038 TEST=None R=oshima TBR=sadrul (This is a reland of https://codereview.chromium.org/114643003) Review URL: https://codereview.chromium.org/102253008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244835 0039d316-1c4b-4281-b951-d872f2087c98
* [OriginChip] Show about: scheme URLs in the chip instead of "Chrome".jdonnelly@chromium.org2014-01-151-5/+8
| | | | | | | | BUG=331908 Review URL: https://codereview.chromium.org/101513008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244834 0039d316-1c4b-4281-b951-d872f2087c98
* Remove more non-aura windows code.jam@chromium.org2014-01-1546-962/+30
| | | | | | | | | BUG=BUG=330735 R=scottmg@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/137993009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244831 0039d316-1c4b-4281-b951-d872f2087c98
* Updating trunk VERSION from 1786.0 to 1787.0chrome-release@google.com2014-01-151-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244829 0039d316-1c4b-4281-b951-d872f2087c98
* Implement GetSelectedText() for the OOP PDF plugin.koz@chromium.org2014-01-1517-1/+80
| | | | | | | | | | | | | This change exposes a SetSelectedText() function to the plugin so it can eagerly notify the plugin host what the currently selected text is. This allows the call to GetSelectedText() to return synchronously with the last selected text, rather than the empty string. R=joi@chromium.org, piman@chromium.org, raymes@chromium.org Review URL: https://codereview.chromium.org/127343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244827 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Remove touch resources"raymes@google.com2014-01-15244-0/+0
| | | | | | | | | | | This reverts commit https://codereview.chromium.org/133073002 which broke the tree: http://build.chromium.org/p/chromium.webkit/builders/Linux%20ChromiumOS%20Builder/builds/37721 BUG= Review URL: https://codereview.chromium.org/139123002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244826 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 244822 "Remove touch resources from gyp/grd files."raymes@google.com2014-01-154-0/+37
| | | | | | | | | | | | | | | | > Remove touch resources from gyp/grd files. > > BUG=none > R=girard@chromium.org > TBR=thestig@chromium.org > > Review URL: https://codereview.chromium.org/132453003 TBR=oshima@chromium.org Review URL: https://codereview.chromium.org/137783009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244825 0039d316-1c4b-4281-b951-d872f2087c98
* Implement DriveAppRegistry::UninstallApp() and GetAppList().kinaba@chromium.org2014-01-155-2/+137
| | | | | | | | | | | | | BUG=324166 First Commit: https://src.chromium.org/viewvc/chrome?view=rev&revision=244182 Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=244189 R=hashimoto@chromium.org Review URL: https://codereview.chromium.org/133123004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244824 0039d316-1c4b-4281-b951-d872f2087c98
* Remove touch resourcesoshima@chromium.org2014-01-15244-0/+0
| | | | | | | | | | BUG=none T=girard@chromium.org R=girard@chromium.org Review URL: https://codereview.chromium.org/133073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244823 0039d316-1c4b-4281-b951-d872f2087c98
* Remove touch resources from gyp/grd files.oshima@chromium.org2014-01-154-37/+0
| | | | | | | | | | BUG=none R=girard@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/132453003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244822 0039d316-1c4b-4281-b951-d872f2087c98
* interactive tests: Complete in-progress animations before sending mouse events.sadrul@chromium.org2014-01-151-0/+12
| | | | | | | | | | | | Sending mouse events while it animates can be flaky, so stop any in-progress animation of the window before sending mouse events to it. BUG=none R=sky@chromium.org Review URL: https://codereview.chromium.org/138633002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244821 0039d316-1c4b-4281-b951-d872f2087c98
* [GCM] Skip some GCM API tests for official linux botsjianli@chromium.org2014-01-151-4/+0
| | | | | | | | | | BUG=334029,334046 TEST=none R=fgorski@chromium.org Review URL: https://codereview.chromium.org/137123008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244818 0039d316-1c4b-4281-b951-d872f2087c98
* Removes duplicated include.sky@chromium.org2014-01-151-1/+0
| | | | | | | | | | R=ben@chromium.org TBR=ben@chromium.org BUG=none Review URL: https://codereview.chromium.org/136793011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244816 0039d316-1c4b-4281-b951-d872f2087c98
* ash: Make sure the cursor is locked when shutdown is requested.sadrul@chromium.org2014-01-152-0/+20
| | | | | | | | | | | | | | | | | | If a mouse is moved during a shutdown in the login/lock screen, then the mouse move event should not make the cursor visible. This currently doesn't work quite right, as the cursor is not 'locked'. The test for it happens to get the correct result currently because there is no window in the lockscreen to receive the event, and so the event is never dispatched, causing the cursor to remain hidden. But there are windows that receive events in the lockscreen during normal runtime. So fix the issue by locking the cursor when requesting shutdown, and update the test accordingly. BUG=none R=oshima@chromium.org Review URL: https://codereview.chromium.org/137523002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244815 0039d316-1c4b-4281-b951-d872f2087c98
* Use a clang-format.exe binary that statically links the msvc runtime.nick@chromium.org2014-01-152-1/+3
| | | | | | | | | | | | | | | | | New version info same as before: clang-format version 3.5 (198831) (I've also updated the UpdatingClangFormatBinaries wiki to reflect build instructions that use /MT). Add OWNERS file for third_party/clang_format. TEST="depends.exe clang-format.exe" shows only DBGHELP.DLL KERNEL32.DLL ADVAPI32.DLL BUG=334416,240309 R=thakis@chromium.org TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/135853007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244814 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2014-01-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244813 0039d316-1c4b-4281-b951-d872f2087c98
* Roll deps2git 238405:244803phajdan.jr@chromium.org2014-01-141-1/+1
| | | | | | | | | | | This rolls in https://codereview.chromium.org/137253004/ BUG=333270, 317931 R=szager@chromium.org Review URL: https://codereview.chromium.org/137443007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244812 0039d316-1c4b-4281-b951-d872f2087c98
* Disable multithreading for goldraymes@google.com2014-01-141-2/+4
| | | | | | | | | | | | | gold is frequently crashing on the buildbots which is most likely due to a race condition when running in multithreaded mode. Disable multithreaded mode until the bug is fixed. BUG=161942 R=thestig@chromium.org Review URL: https://codereview.chromium.org/137573003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244811 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 244591 "Move refresh_tokens_ to MutableProfileOAuth2Token..."zea@chromium.org2014-01-148-249/+226
| | | | | | | | | | | | | | | | | | | | | | Top crasher in canary. See bug 334251. > Move refresh_tokens_ to MutableProfileOAuth2TokenService. > > This CL moves refresh_tokens_ from ProfileOAuth2TokenService to > MutableProfileOAuth2TokenService. It also removes some unused private > methods from ProfileOAuth2TokenService. > > R=rogerta > TBR=sky, rohitrao > BUG=320625 > > Review URL: https://codereview.chromium.org/114513003 TBR=msarda@chromium.org Review URL: https://codereview.chromium.org/132993006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244810 0039d316-1c4b-4281-b951-d872f2087c98
* GTTF: Run perf tests seriallyphajdan.jr@chromium.org2014-01-144-3/+68
| | | | | | | | | | | | | | | | | This makes media_perftests run serially (see https://codereview.chromium.org/112633009). Also update other perf tests (initially changed by https://codereview.chromium.org/47023009/ and https://codereview.chromium.org/52443004) now that we have LaunchUnitTestsSerially (for consistency). BUG=236893 R=dalecurtis@chromium.org, jamesr@chromium.org, piman@chromium.org Review URL: https://codereview.chromium.org/128593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244806 0039d316-1c4b-4281-b951-d872f2087c98
* app_shell: Fix resources.pak dependency issuejamescook@chromium.org2014-01-141-0/+2
| | | | | | | | | | | | | | app_shell needs extensions-related feature JSON data, which is in resources.pak. Without that file app_shell will build normally but crash at runtime. BUG=none TEST=clean build of just the app_shell can launch normally R=miket@chromium.org, tony@chromium.org Review URL: https://codereview.chromium.org/131203008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244802 0039d316-1c4b-4281-b951-d872f2087c98
* Files.app: Fix a bug of renaming.hirono@chromium.org2014-01-141-1/+1
| | | | | | | | | | | | | Currently if a file is renamed to an existing file name, it is failed silently and it looks the file is copied in the file list. This is caused a name of variable wrong in the error handler. BUG=332303 TEST=manually Review URL: https://codereview.chromium.org/137543005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244798 0039d316-1c4b-4281-b951-d872f2087c98
* SPDY 4: Remove CREDENTIAL from SPDY 4.jgraettinger@chromium.org2014-01-142-52/+54
| | | | | | | | | | This lands server change 54240110 by hkhalil. R=rch@chromium.org Review URL: https://codereview.chromium.org/137403004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244797 0039d316-1c4b-4281-b951-d872f2087c98
* Update .DEPS.gitchrome-admin@google.com2014-01-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244796 0039d316-1c4b-4281-b951-d872f2087c98
* Update DEPS for fontconfigspang@chromium.org2014-01-141-1/+1
| | | | | | | | | | | | | | The DEPS entry was an annotated tag rather than commit, which is confusing some of the tools. BUG=none TEST=none NOTRY=true TBR=rjkroege Review URL: https://codereview.chromium.org/135403006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244795 0039d316-1c4b-4281-b951-d872f2087c98
* Grant unlimited storage quota to chrome-devtools://devtools originyurys@chromium.org2014-01-141-0/+5
| | | | | | | | | | Chrome DevTools front-end uses temporary file storage to cache Heap and CPU profiles and may need quite a lot of space. BUG=324769,327298 Review URL: https://codereview.chromium.org/121213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244794 0039d316-1c4b-4281-b951-d872f2087c98
* Image assets for phantom windows when using ↵pkotwicz@chromium.org2014-01-1418-0/+0
| | | | | | | | | | | | --ash-enable-alternate-caption-button BUG=328930 TEST=None TBR=sky Review URL: https://codereview.chromium.org/134963004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244790 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 244760 "Track when profiles are last used."zea@chromium.org2014-01-145-44/+0
| | | | | | | | | | | | | | | | | | | | | Speculatively reverted due to consistent linux asan failure for StartupBrowserCreatorTest.ProfilesWithoutPagesNotLaunched. http://build.chromium.org/p/chromium.memory/buildstatus?builder=Linux%20ASAN%20Tests%20%282%29&number=21744 > Track when profiles are last used. > > This will allow use to ignore profiles unused for a certain length of time (likely 28 days) when calculating statistics on number of profiles, number of signed-in profiles, etc. > > BUG=295817 > > Review URL: https://codereview.chromium.org/134863002 TBR=bcwhite@chromium.org Review URL: https://codereview.chromium.org/136153005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244789 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 244779 "Call XSetInputFocus after XRaiseWindow when activ..."pauljensen@chromium.org2014-01-141-1/+0
| | | | | | | | | | | | | | | | | | | Looks like it's causing DesktopScreenX11Test.GetWindowAtScreenPoint to fail. > Call XSetInputFocus after XRaiseWindow when activating. > > XRaiseWindow does not reliably set the focus. GTK code is doing the same > thing, see gdk/x11/gdkwindow-x11.c. > > BUG=None > > Review URL: https://codereview.chromium.org/137533006 TBR=mlamouri@chromium.org Review URL: https://codereview.chromium.org/137793005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244787 0039d316-1c4b-4281-b951-d872f2087c98
* IndexedDB: Verify that index id/key vectors are the same lengthjsbell@chromium.org2014-01-141-0/+11
| | | | | | | | | R=tsepez@chromium.org, ianbeer@chromium.org, inferno@chromium.org BUG=334274 Review URL: https://codereview.chromium.org/135733003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244786 0039d316-1c4b-4281-b951-d872f2087c98
* Do not build libpixman with MSan instrumentation.earthdok@chromium.org2014-01-141-1/+1
| | | | | | | | | | | Partial revert of r244764. BUG=334351 TBR=glider@chromium.org Review URL: https://codereview.chromium.org/138673003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244785 0039d316-1c4b-4281-b951-d872f2087c98
* Hook up ARM architecture flags to GN build.brettw@chromium.org2014-01-142-0/+54
| | | | | | | | | | | This duplicates the ARM architecture logic from common.gypi. R=scottmg@chromium.org TBR=scottmg Review URL: https://codereview.chromium.org/137493004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244782 0039d316-1c4b-4281-b951-d872f2087c98
* Move GN's glib_cxx_debug flag onto the debug configuration.brettw@chromium.org2014-01-142-5/+7
| | | | | | | | | | | Previously this was in a global config which also applied to the release build. R=thakis@chromium.org TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/137553002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244781 0039d316-1c4b-4281-b951-d872f2087c98
* Bring base/BUILD.gn up-to-date with build file changes.brettw@chromium.org2014-01-141-0/+12
| | | | | | | | | R=scottmg@chromium.org TBR=scottmg@chromium.org Review URL: https://codereview.chromium.org/137533004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244780 0039d316-1c4b-4281-b951-d872f2087c98
* Call XSetInputFocus after XRaiseWindow when activating.mlamouri@chromium.org2014-01-141-0/+1
| | | | | | | | | | | XRaiseWindow does not reliably set the focus. GTK code is doing the same thing, see gdk/x11/gdkwindow-x11.c. BUG=None Review URL: https://codereview.chromium.org/137533006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244779 0039d316-1c4b-4281-b951-d872f2087c98
* python_arch: return "unknown" when file does not existvapier@chromium.org2014-01-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The `file` program follows POSIX as outlined here: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/file.html Specifically, this part causes troubles: If the file named by the file operand does not exist, cannot be read, or the type of the file named by the file operand cannot be determined, this shall not be considered an error that affects the exit status. With older versions of `file` (that does not conform to POSIX), this script will exit 0 with "unknown" as its output when "$1" does not exist. But with recent releases (that conform to POSIX), this script will exit 1 and can break the build. Have the script explicitly check for the existence of $1 and if it does not exist, then runt he unknown logic like normal. BUG=chromium:332547 TEST=ran python_arch.sh on bogus files with new & old `file` programs Review URL: https://codereview.chromium.org/137433002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244778 0039d316-1c4b-4281-b951-d872f2087c98
* Remove WebString refs from cc/, they are all dead codejamesr@chromium.org2014-01-149-54/+1
| | | | | | | | | | | These are all dead code - production code never calls any functions that would deal with a WebString. BUG=181120 Review URL: https://codereview.chromium.org/134383004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244777 0039d316-1c4b-4281-b951-d872f2087c98
* [cr tool] Make cr module load deterministiciancottrell@chromium.org2014-01-141-1/+1
| | | | | | | | BUG=327610 Review URL: https://codereview.chromium.org/132993005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244776 0039d316-1c4b-4281-b951-d872f2087c98
* Add UMA metric for all malicious download warningsfelt@chromium.org2014-01-144-0/+30
| | | | | | | | | | This adds Download.MaliciousDownloadClassified, which should count all of the downloads that are labelled with one of the malicious download warnings. Each download should be recorded precisely once. BUG=333309 Review URL: https://codereview.chromium.org/137283002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244774 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Update currentWebContents_ in -[InfoBarContainerController ↵rsesek@chromium.org2014-01-141-0/+1
| | | | | | | | | | | changeWebContents:]. BUG=329699 TEST=See comment 10 in bug for steps. Review URL: https://codereview.chromium.org/137053004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244773 0039d316-1c4b-4281-b951-d872f2087c98
* Telemetry: Extend key_silk_cases page set.dominikg@chromium.org2014-01-143-0/+251
| | | | | | | | | | | Adds pages to the key_silk_cases page set that require more advanced synthetic gestures, e.g. swipe and tap. BUG=323275 Review URL: https://codereview.chromium.org/137053002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244772 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Allow to mock out BindingManager for testing.ppi@chromium.org2014-01-144-292/+327
| | | | | | | | | | | | | This patch splits BindingManager into interface and implementation, allowing embedders to mock it out for integration testing, i.e. to verify that the signals about renderer visibility are correctly delivered without exercising the real implementation. BUG=325896 Review URL: https://codereview.chromium.org/137043002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244771 0039d316-1c4b-4281-b951-d872f2087c98
* Remove some code inside USE_AURA and OS_WIN ifdefs in content.jam@chromium.org2014-01-1444-5833/+40
| | | | | | | | | | | I also removed the _win.cc files inside content. BUG=330735 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/137403005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244768 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 244708 "Manual profile reset: reset shortcuts on Windows."pauljensen@chromium.org2014-01-1414-800/+175
| | | | | | | | | | | | | | | | Looks like it causes ProfileSettingsResetWebUITest.testOpenProfileSettingsReset to fail most of the time. > Manual profile reset: reset shortcuts on Windows. > > BUG=324931 > > Review URL: https://codereview.chromium.org/116143003 TBR=vasilii@chromium.org Review URL: https://codereview.chromium.org/134873009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244766 0039d316-1c4b-4281-b951-d872f2087c98
* Build more libraries with MemorySanitizer instrumentation.earthdok@chromium.org2014-01-141-4/+4
| | | | | | | | | | | | The latest clang roll added a missing MSan interceptor, which made those libraries buildable with MSan. BUG=178409 TBR=glider@chromium.org Review URL: https://codereview.chromium.org/130903004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244764 0039d316-1c4b-4281-b951-d872f2087c98
* Gets views_examples_exe working on desktop aurasky@chromium.org2014-01-143-5/+49
| | | | | | | | | | BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/136973008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244763 0039d316-1c4b-4281-b951-d872f2087c98
* [DevTools] Fix DCHECK hitting on DevTools reload.dgozman@chromium.org2014-01-141-0/+3
| | | | | | | | | | | | Browser assumed that WebContents must be in TabStripModel, while docked DevTools is not. BUG=none TEST=Open docked DevTools, hit Alt+R, nothing bad happens. Review URL: https://codereview.chromium.org/136863002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244762 0039d316-1c4b-4281-b951-d872f2087c98