summaryrefslogtreecommitdiffstats
path: root/base
Commit message (Collapse)AuthorAgeFilesLines
* Reland r49188.willchan@chromium.org2010-06-098-72/+307
| | | | | | | | It was reverted due to breaking a valgrind test which has since been disabled. Review URL: http://codereview.chromium.org/2763004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49320 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 48102 - this test is now failing again, apparently since r49188 ↵joth@chromium.org2010-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | landed. As it is not clear this test was enabled due to the functionality it test being required (indeed, the comment still states it is not), disabling it again to get the tree open. Original description from reverted change r48102: TTF: Re-enable the FileDescriptorWatcherOutlivesMessageLoop test as it now appears to be passing. BUG=none TEST=MessageLoopTest.FileDescriptorWatcherOutlivesMessageLoop Patch by Doug Muir <dmuir@google.com>. Review URL: http://codereview.chromium.org/2077014 TBR=jhawkins@chromium.org Review URL: http://codereview.chromium.org/2789002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49241 0039d316-1c4b-4281-b951-d872f2087c98
* Rebaseline tests whose expectations were changed by r55714.hamaji@chromium.org2010-06-098-307/+72
| | | | | | | | | | | | The patch removed extra paddings inside buttons. http://trac.webkit.org/changeset/55714 BUG=1437 TEST=none Review URL: http://codereview.chromium.org/789003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49225 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "posix: set thread names"evan@chromium.org2010-06-082-67/+8
| | | | | | This reverts commit r49212. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49214 0039d316-1c4b-4281-b951-d872f2087c98
* posix: set thread namesevan@chromium.org2010-06-082-8/+67
| | | | | | | | | | | | | There's a non-portable function for doing this: pthread_setname_np. It's supported by OS X >= 10.6 and the Xcode debugger will show the thread names if they're provided. On Linux, support has just recently been added to glibc for the same function. Since OS coverage of the function is so spotty, we look for the symbol at runtime; on Linux we fall back to another implementation of the same functionality if the function isn't available. Review URL: http://codereview.chromium.org/2774001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49212 0039d316-1c4b-4281-b951-d872f2087c98
* Jankometer: Generalize the code more. Add better support for monitoring IO ↵willchan@chromium.org2010-06-088-72/+307
| | | | | | | | | | | | | thread. Previously, the Jankometer only monitored windows messages on the UI thread (or gtk events). I've added observers for tasks and IO events. This lets us monitor all events on UI & IO threads (UI messages, all Tasks, and IO events). Replaces the JankObserver with a UIJankObserver and an IOJankObserver. Shares common code in JankObserverHelper. The JankObserverHelper and JankWatchdog are generic enough that they can probably move out to chrome/common and be reused by the renderer. Review URL: http://codereview.chromium.org/2098020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49188 0039d316-1c4b-4281-b951-d872f2087c98
* Make SysNativeMB converters assume UTF-8 on Chrome OS. jshin@chromium.org2010-06-071-0/+15
| | | | | | | | | | | Instead of using wcs*mbs and mbs*wcs, just call UTF-8 converters. BUG=39096 TEST=Covered by existing tests Review URL: http://codereview.chromium.org/1222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49118 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.tfarina@chromium.org2010-06-071-1/+5
| | | | | | | | | | | TODO: Fix the remaining usages in third_party libraries and get rid of the macro in question. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/2657005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49032 0039d316-1c4b-4281-b951-d872f2087c98
* Use DISALLOW_COPY_AND_ASSIGN instead of DISALLOW_EVIL_CONSTRUCTORS in app ↵tfarina@chromium.org2010-06-0411-27/+27
| | | | | | | | | | | and base directories. BUG=None TEST=None Review URL: http://codereview.chromium.org/2654001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48931 0039d316-1c4b-4281-b951-d872f2087c98
* Record out-of-proc-tests' FAILS/FLAKY failures in the XML output.kinuko@chromium.org2010-06-031-0/+6
| | | | | | | | | BUG=40473 TEST=Run browser_tests and see if failed FAILS_ or FLAKY_ tests are recorded in its XML output. Also make sure that failures of FAILS/FLAKY tests don't make the browser_tests exit with non-zero return value. Review URL: http://codereview.chromium.org/2431003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48873 0039d316-1c4b-4281-b951-d872f2087c98
* Add Tokenize() for StringPiece.mbelshe@chromium.org2010-06-023-41/+59
| | | | | | | | | BUG=none TEST=StringUtilTest.TokenizeStringPiece Review URL: http://codereview.chromium.org/2463007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48792 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored Histogram::FactoryGet() to be style-compliantziadh@chromium.org2010-06-022-7/+7
| | | | | | | | | | Currently, two (2) overloaded versions of Histogram::FactoryGet() exist. Google's C++ style guide discourages such implementations. I refactored the methods into Histogram::FactoryGet() (no name change), which takes 'Sample' types as arguments, and Histogram::FactoryTimeGet(), which takes base::TimeDelta types as arguments. r = jar Review URL: http://codereview.chromium.org/2423004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48766 0039d316-1c4b-4281-b951-d872f2087c98
* Disable CFAllocator patching on systems for which we don't know their ↵avi@chromium.org2010-06-021-26/+36
| | | | | | | | | | | internal structure. BUG=http://crbug.com/45363 TEST=no crash on unreleased systems Review URL: http://codereview.chromium.org/2417008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48747 0039d316-1c4b-4281-b951-d872f2087c98
* Reset signal handlers in forked children.agl@chromium.org2010-06-021-0/+7
| | | | | | | | | | | | If a signal is delivered to a child process in between forking and execing then it will trigger Chrome's signal handlers. This will likely result in sadness. BUG=44953 http://codereview.chromium.org/2452003/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48744 0039d316-1c4b-4281-b951-d872f2087c98
* Implement most of the ridealong fixes/cleanups I suggested during review for ↵pkasting@chromium.org2010-06-011-27/+27
| | | | | | | | | | enabling warn-on-signed-versus-unsigned-equality-comparisions on Windows. BUG=none TEST=none Review URL: http://codereview.chromium.org/2395001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48666 0039d316-1c4b-4281-b951-d872f2087c98
* Pressing the search button brings the NTP or close it if it is opened.jcivelli@chromium.org2010-06-011-0/+2
| | | | | | | | | | | | Note: this requires the WebKit https://bugs.webkit.org/show_bug.cgi?id=39752 to work. BUG=3404 TEST=See bug. Review URL: http://codereview.chromium.org/2260004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48658 0039d316-1c4b-4281-b951-d872f2087c98
* Use SSLClientSocketNSS on Mac OS X. By default, chrome still useswtc@chromium.org2010-06-012-11/+5
| | | | | | | | | | | | | | | | | | SSLClientSocketMac. Specify the --use-nss-for-ssl command-line option to use SSLClientSocketNSS. The nss.gyp in src/net/third_party/nss is renamed ssl.gyp to avoid a naming conflict with the nss.gyp in src/third_party/nss. The GYP generator for Xcode project files disallows same-named .gyp files. SSL client authentication doesn't work yet. R=mark BUG=30689 TEST=No build and test failures on Mac and Windows. Review URL: http://codereview.chromium.org/2322008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48650 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing AutoReset to be a template.gspencer@chromium.org2010-06-012-12/+15
| | | | | | | | | | | I've run into a couple of times this week when I needed one of these, for two different types besides bool. Time to fix the TODO. TEST=trybots FTW, and built locally. BUG=none Review URL: http://codereview.chromium.org/2394001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48644 0039d316-1c4b-4281-b951-d872f2087c98
* [GTTF] Add FRIEND_TEST_ALL_PREFIXES, a FRIEND_TEST replacementphajdan.jr@chromium.org2010-06-014-8/+36
| | | | | | | | | | | that works with all test prefixes (DISABLED, FLAKY, FAILS). TEST=none BUG=44549 Review URL: http://codereview.chromium.org/2439001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48634 0039d316-1c4b-4281-b951-d872f2087c98
* Don't run ProcessUtilTest.EnableLFH under Dr.Memorytimurrrr@chromium.org2010-06-011-0/+1
| | | | | | | TBR=glider Review URL: http://codereview.chromium.org/2461001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48626 0039d316-1c4b-4281-b951-d872f2087c98
* Don't run some of the base tests under Dr.Memorytimurrrr@chromium.org2010-06-011-0/+5
| | | | | | | TBR=glider Review URL: http://codereview.chromium.org/2417002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48623 0039d316-1c4b-4281-b951-d872f2087c98
* Remove deprecated file_util::ReplaceExtension API.tfarina@chromium.org2010-06-013-75/+0
| | | | | | | | | BUG=24672 TEST=out/Debug/base_unittests Review URL: http://codereview.chromium.org/2445001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48614 0039d316-1c4b-4281-b951-d872f2087c98
* Remove deprecated versions of Registry functions.tfarina@chromium.org2010-05-311-93/+45
| | | | | | | | | BUG=None TEST=trybots Review URL: http://codereview.chromium.org/2403001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48581 0039d316-1c4b-4281-b951-d872f2087c98
* Fix typo in comments, and update comment.jar@chromium.org2010-05-291-4/+1
| | | | | | | | | | This is really a patch from Ziad Hatahet, and can be seen at http://codereview.chromium.org/2366006/show R=ziadh Review URL: http://codereview.chromium.org/2396001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48550 0039d316-1c4b-4281-b951-d872f2087c98
* Add a method that truncates strings to the end point of a valid UTF8 ↵nick@chromium.org2010-05-283-0/+212
| | | | | | | | | | | | | character, leaving the string's size to be less than or equal to a specified byte size. BUG=43675 TEST=base/string_util_unittest.cc Patch contributed by to Jerrica Jones (jerrica@chromium.org). Review URL: http://codereview.chromium.org/2239007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48518 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will make mbelshe@chromium.org2010-05-279-31/+27
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2222002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48395 0039d316-1c4b-4281-b951-d872f2087c98
* Drop a file from the gyp that was deleted in r35326.avi@chromium.org2010-05-261-1/+0
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/2276003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48291 0039d316-1c4b-4281-b951-d872f2087c98
* Don't run StatsTableTest.*MultipleThreads under TSantimurrrr@chromium.org2010-05-261-0/+3
| | | | | | | | BUG=45083 TBR=glider Review URL: http://codereview.chromium.org/2278001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48265 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Another dependency the bbot missed!!!"rafaelw@chromium.org2010-05-269-27/+31
| | | | | | | | | | | | | | | | | | This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98. Revert "Missed a file as part of checkin for r48186" This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b. Revert "Enable warning 4389 as an error on windows builds. This will make" This reverts commit c78936bcfc65b98edf288191d927a495b0364621. TBR=mbelshe Review URL: http://codereview.chromium.org/2253001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
* file_util: Convert the wstring version of IsDirectoryEmpty to FilePath.tfarina@chromium.org2010-05-264-14/+30
| | | | | | | | | BUG=24672 TEST=compiles Review URL: http://codereview.chromium.org/2153002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48237 0039d316-1c4b-4281-b951-d872f2087c98
* Enable warning 4389 as an error on windows builds. This will makembelshe@chromium.org2010-05-259-31/+27
| | | | | | | | | | | | windows builds more similar to linux/mac, which already treat signed/ unsigned equality comparisons as warnings (and hence errors). BUG=44471 TEST=none Review URL: http://codereview.chromium.org/2081007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Re-enable MessageLoopTest.EnsureTaskDeletion* by marking them as failing.jhawkins@chromium.org2010-05-251-3/+6
| | | | | | | | TBR=stuartmorgan BUG=none TEST=MessageLoopTest.EnsureTaskDeletion* git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48184 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Re-enable to tests used only for manual testing. We still want coveragejhawkins@chromium.org2010-05-251-8/+6
| | | | | | | | | | from those tests. Mark StackTrace.OutputToStream as flaky. TBR=stuartmorgan BUG=32070 TEST=StackTrace.* git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48183 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Re-enable StatsTableTest.MultipleThreads by marking it flaky.jhawkins@chromium.org2010-05-251-2/+2
| | | | | | | | TBR=stuartmorgan BUG=10611 TEST=StatsTableTest.MultipleThreads git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48180 0039d316-1c4b-4281-b951-d872f2087c98
* Merge tcmalloc r93 into the Chromium tcmalloc branch.glider@chromium.org2010-05-251-1/+1
| | | | | | | | | We can't afford using r94 due to a performance regression. TBR=willchan,antonm,jar,mbelshe Review URL: http://codereview.chromium.org/2144003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48145 0039d316-1c4b-4281-b951-d872f2087c98
* TTF: Re-enable the FileDescriptorWatcherOutlivesMessageLoop test as it now ↵jhawkins@chromium.org2010-05-241-2/+1
| | | | | | | | | | | | | | | appears to be passing. BUG=none TEST=MessageLoopTest.FileDescriptorWatcherOutlivesMessageLoop Patch by Doug Muir <dmuir@google.com>. Review URL: http://codereview.chromium.org/2077014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48102 0039d316-1c4b-4281-b951-d872f2087c98
* Add unused return warnings to the release() methods of some scoped Mac objectsstuartmorgan@chromium.org2010-05-242-3/+5
| | | | | | | | | BUG=43608 TEST=None Review URL: http://codereview.chromium.org/2083021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48038 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 48024 - Reland http://codereview.chromium.org/1735024/show to assess ↵glider@chromium.org2010-05-241-1/+1
| | | | | | | | | | | the performance. Review URL: http://codereview.chromium.org/2164001 TBR=antonm,willchan Review URL: http://codereview.chromium.org/2155002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48032 0039d316-1c4b-4281-b951-d872f2087c98
* Make out-of-process tests output correct XML file (re-submitting due to ↵kinuko@chromium.org2010-05-241-2/+5
| | | | | | | | | | | | | | | | wrong revert) - Disable XML output for children - Output XML file with failed, disabled and timing information in the parent launcher process. BUG=40473,42781 TEST=run the browser_tests (or other tests that uses out-of-proc-test runner) with 1) --gtest_output=xml 2) --gtest_output=xml:test.xml 3) --gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information. TBR=phajdan.jr,satorux Review URL: http://codereview.chromium.org/2148002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48028 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land http://codereview.chromium.org/1735024/show to assess the performance.glider@chromium.org2010-05-241-1/+1
| | | | | | | | TBR=antonm,willchan Review URL: http://codereview.chromium.org/2164001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48024 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 48015 - Make outofprocess tests output correct XML file (filepath fixed)kinuko@chromium.org2010-05-241-5/+2
| | | | | | | | | | | | | | | | | | | | | Original issue was: http://codereview.chromium.org/2071001/show (reverted due to build break) Disable XML output for children Output XML file with failed, disabled and timing information in the parent launcher process. BUG=40473,42781 TEST=run the browser_tests (or other tests that uses outofproctest runner) with 1) gtest_output=xml 2) gtest_output=xml:test.xml 3) gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information. Review URL: http://codereview.chromium.org/2071001 Review URL: http://codereview.chromium.org/2067022 TBR=satorux@chromium.org Review URL: http://codereview.chromium.org/2161001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48019 0039d316-1c4b-4281-b951-d872f2087c98
* Make out-of-process tests output correct XML file (filepath fixed)kinuko@chromium.org2010-05-241-2/+5
| | | | | | | | | | | | | | | | | | Original issue was: http://codereview.chromium.org/2071001/show (reverted due to build break) - Disable XML output for children - Output XML file with failed, disabled and timing information in the parent launcher process. BUG=40473,42781 TEST=run the browser_tests (or other tests that uses out-of-proc-test runner) with 1) --gtest_output=xml 2) --gtest_output=xml:test.xml 3) --gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information. Review URL: http://codereview.chromium.org/2071001 Review URL: http://codereview.chromium.org/2067022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48015 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Infrastructure for serialization of OS fonts over IPC.jeremy@chromium.org2010-05-231-2/+2
| | | | | | | | | BUG=29729 TEST=All unit tests should pass. Review URL: http://codereview.chromium.org/2131005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48002 0039d316-1c4b-4281-b951-d872f2087c98
* Add virtual destructor to base class to resolve leak.jar@chromium.org2010-05-211-0/+1
| | | | | | | | | | | | | | This appears to resolve the regression that might have been instigated in 44435. This was very significant on Windows, as the derived class held a lot of data in file_version_info_win.cc. BUG=44320 r=mbelshe Review URL: http://codereview.chromium.org/2131023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47964 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47897 - Linux: Add libunwind as a dependency of tcmalloc in 64 bit mode.willchan@chromium.org2010-05-211-21/+3
| | | | | | | | | | | | | | Based on willchan's patch here: http://codereview.chromium.org/2109009/show BUG=40149 TEST=none TBR=willchan Review URL: http://codereview.chromium.org/2137010 TBR=thestig@chromium.org Review URL: http://codereview.chromium.org/2107016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47933 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed a TODO in data export of net-internals, added Chrome version and ↵maruel@chromium.org2010-05-212-0/+8
| | | | | | | | | | | | | command line. BUG=none TEST=Go to about:net-internals click on dump to text, check if version and command line are good. Patch contributed by malavv Review URL: http://codereview.chromium.org/2104012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47926 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47917 - Make outofprocess tests output correct XML filenick@chromium.org2010-05-211-5/+2
| | | | | | | | | | | | | | | | Disable XML output for children Output XML file with failed, disabled and timing information in the parent launcher process. BUG=40473,42781 TEST=run the browser_tests (or other tests that uses outofproctest runner) with 1) gtest_output=xml 2) gtest_output=xml:test.xml 3) gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information. Review URL: http://codereview.chromium.org/2071001 TBR=kinuko@chromium.org Review URL: http://codereview.chromium.org/2119016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47920 0039d316-1c4b-4281-b951-d872f2087c98
* Make out-of-process tests output correct XML filekinuko@chromium.org2010-05-211-2/+5
| | | | | | | | | | | | | - Disable XML output for children - Output XML file with failed, disabled and timing information in the parent launcher process. BUG=40473,42781 TEST=run the browser_tests (or other tests that uses out-of-proc-test runner) with 1) --gtest_output=xml 2) --gtest_output=xml:test.xml 3) --gtest_output=xml:/tmp/ and see if the output XML file (test_detail.xml for 1), test.xml for 2), /tmp/browser_tests.xml for 3)) contains correct information. Review URL: http://codereview.chromium.org/2071001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47917 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 47789 - The newer version of tcmalloc should fix the problems with ↵glider@chromium.org2010-05-211-1/+1
| | | | | | | | | | | running tcmalloc under Valgrind. Review URL: http://codereview.chromium.org/1735024 TBR=willchan,antonm Review URL: http://codereview.chromium.org/2138002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47909 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Add libunwind as a dependency of tcmalloc in 64 bit mode.thestig@chromium.org2010-05-211-3/+21
| | | | | | | | | | | Based on willchan's patch here: http://codereview.chromium.org/2109009/show BUG=40149 TEST=none TBR=willchan Review URL: http://codereview.chromium.org/2137010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47897 0039d316-1c4b-4281-b951-d872f2087c98