summaryrefslogtreecommitdiffstats
path: root/chrome/service
Commit message (Collapse)AuthorAgeFilesLines
* Rename all methods accessing Singleton<T> as GetInstance().satish@chromium.org2010-12-131-2/+2
| | | | | | | | | | | | | This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton. I also moved pepper::ResourceTracker to a lazy instance since there were too many places in code where this class was being accessed from and this was a smaller change than renaming methods in that case. BUG=65298 TEST=all existing tests should pass. Review URL: http://codereview.chromium.org/5685007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68982 0039d316-1c4b-4281-b951-d872f2087c98
* Start deinlining non-empty virtual methods. (This will be automatically checkederg@google.com2010-12-092-6/+9
| | | | | | | | | | | for in the future.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5574006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68746 0039d316-1c4b-4281-b951-d872f2087c98
* Sanitize PrefStore interface.mnissler@chromium.org2010-12-096-41/+146
| | | | | | | | | | | | | | | | | This reworks the PrefStore interface, specifically: - Split up the interface into PrefStore, which only provides reading functionality, and the derived PersistentPrefStore for the actual user pref store - Remove the hurt-me-plenty prefs() function from PrefStore, instead provide Get/Set/Remove operations - Remove special handling of default and user pref store from PrefValueStore and put it into PrefService - Pref change notification handling now almost exclusively handled through PrefValueStore - Adjust all consumers of these interfaces (but keep ConfigurationPolicyPrefStore untouched, that's up next on the list) BUG=64232 TEST=existing unit tests Review URL: http://codereview.chromium.org/5646003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68736 0039d316-1c4b-4281-b951-d872f2087c98
* Add a new GetInstance() method for singleton classes under chrome/service ↵satish@chromium.org2010-12-092-5/+5
| | | | | | | | | | | | | | | | | | | | and /net. This is a small step towards making all singleton classes use the Singleton<T> pattern within their code and not expect the callers to know about it. This CL includes files under chrome/service and /net with related files elsewhere. Suggested files to focus for reviewers: - @sanjeevr for chrome/common and chrome/service - @ukai for net/websockets - @agl for rest of net BUG=65298 TEST=all existing tests should continue to pass. Review URL: http://codereview.chromium.org/5634005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68722 0039d316-1c4b-4281-b951-d872f2087c98
* Add the "virtual" keyword on method overrides that are missing it.erg@google.com2010-12-082-5/+7
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5648004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68606 0039d316-1c4b-4281-b951-d872f2087c98
* Move more code from headers to implementation.erg@google.com2010-12-072-0/+5
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/5624002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68534 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the Visual Studio 2005 build.darin@chromium.org2010-12-031-1/+1
| | | | | | | | | | | | | | | It seems like VS is getting confused by the meaning of CloudPrintURLFetcher::Delegate. It may be related to the fact that CloudPrintURLFetcher inherits from an interface named Delegate, but I don't know for sure. R=sanjeevr BUG=none TEST=none Review URL: http://codereview.chromium.org/5549008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68226 0039d316-1c4b-4281-b951-d872f2087c98
* Add a base class for objects that want to filter messages on the IO thread. ↵jam@chromium.org2010-12-021-1/+1
| | | | | | | | | I'll switch the filters to it in future separate changes. I've also taken out the special case for an initial filter from the IPC classes. The reason it existed was that there was a race condition of some messages not being filtered if a filter is added after construction but before launching the peer process. Taking it out allows us to add more than one filter and makes things a little cleaner. Review URL: http://codereview.chromium.org/5513001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68043 0039d316-1c4b-4281-b951-d872f2087c98
* Changed the CloudPrint Proxy custom header from X-Google-CloudPrint-Proxy to ↵sanjeevr@chromium.org2010-12-011-1/+1
| | | | | | | | | | | X-CloudPrint-Proxy because GFE does not let the other one through. BUG=None TEST=Cloud print proxy Review URL: http://codereview.chromium.org/5470001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67870 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)thestig@chromium.org2010-11-301-0/+1
| | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/5139006 TBR=thestig@chromium.org Review URL: http://codereview.chromium.org/5270010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67674 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove unneeded headers from base/ (part 10)thestig@chromium.org2010-11-301-1/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/5139006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67662 0039d316-1c4b-4281-b951-d872f2087c98
* Implement exponential back-off mechanism.joi@chromium.org2010-11-258-107/+57
| | | | | | | | | | | | | | | | | | | | | | | Contributed by yzshen@google.com, original review http://codereview.chromium.org/4194001/ Implement exponential back-off mechanism. Enforce it at the URLRequestHttpJob level for all outgoing HTTP requests. The reason why to make this change is that we need back-off logic at a lower enough level to manage all outgoing HTTP traffic, so that the browser won't cause any DDoS attack. This change: 1) patches http://codereview.chromium.org/2487001/show, which is the exponential back-off implementation. 2) resolves conflicts with URLFetcher, by removing its own back-off logic: -- removes url_fetcher_protect.{h,cc}; -- integrates the sliding window mechanism of URLFetcherProtectEntry into RequestThrottlerEntry. 3) resolves conflicts with CloudPrintURLFetcher. 4) makes unit tests of CloudPrintURLFetcher, URLFetcher and URLRequest work. BUG=none TEST=pass all existing tests and also the newly-added request_throttler_unittest.cc Review URL: http://codereview.chromium.org/5276007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67375 0039d316-1c4b-4281-b951-d872f2087c98
* Use VP8 over PseudoTCP by default.sergeyu@chromium.org2010-11-231-2/+2
| | | | | | | | | | | Added option in simple_host to choose video codec. Removed ugly ifdefs from chromoting_host.cc. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/5298001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67164 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Revert "net: Plumb DnsCertProvenanceChecker around.""agl@chromium.org2010-11-221-0/+1
| | | | | | (See r66623 for details.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66985 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "net: Plumb DnsCertProvenanceChecker around."agl@chromium.org2010-11-221-1/+0
| | | | | | This reverts commit r66970. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66974 0039d316-1c4b-4281-b951-d872f2087c98
* net: Plumb DnsCertProvenanceChecker around.agl@chromium.org2010-11-221-0/+1
| | | | | | (Reland of r66623, reverted in r66687 due to Chrome Frame linking issues.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66970 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed an issue with flaky connections causing too many job fetches. The ↵sanjeevr@chromium.org2010-11-228-30/+86
| | | | | | | | | | | | | logic on losing or regaining XMPP connection has been simplified to just schedule a delayed job fetch in both cases. Also sent the reason for job fetches to the server as part of the query parameters. BUG=NONE TEST=Test Cloud Print proxy with flaky connection, should not cause fetch storm. Review URL: http://codereview.chromium.org/5137006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66969 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ThreadChecker to use Locks and not use scoped_ptr.willchan@chromium.org2010-11-212-0/+2
| | | | | | | | | | | | | | | It needs to synchronize its checks, since in order to assert correctly, it needs to make sure the thread id is synchronized on all threads. It doesn't need scoped_ptr. It was trying to use NULL to catch invalid thread ids. 0 is already assumed to be invalid (see base::Thread's use). Eliminating scoped_ptr fixes a valgrind/heapcheck issue where they don't follow LazyInstance objects' member pointers. So they think the ThreadChecker's member variable is leaked, even though the global object still has a pointer to it. Removing the scoped_ptr.h caused a bunch of other lame files to fail to compile. I had to fix those places. #include what you use please :( TBR=levin (I want to green the memory bots) BUG=none TEST=none Review URL: http://codereview.chromium.org/5180006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66915 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "net: Plumb DnsCertProvenanceChecker around."agl@chromium.org2010-11-181-1/+0
| | | | | | | This reverts commit r66623. Some how it causes libnspr4.dll to be linked in Chrome Frame builds. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66687 0039d316-1c4b-4281-b951-d872f2087c98
* net: Plumb DnsCertProvenanceChecker around.agl@chromium.org2010-11-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | DnsCertProvenanceChecker is introduced to abstract away the action of uploading reports. It's implemented by ChromeDnsCertProvenanceChecker which lives in a scoped_ptr off of a URLRequestContext. It's only active on the main context (i.e. not in incognito mode). This might change in the future, but it's a nice, conservative choice for the moment. The DnsCertProvenanceChecker is plumbed all the way to SSLClientSocket (via HttpCache) where it replaces the DnsRRResolver. Above SSLClientSocket, it's plumbed in addition to the DnsRRResolver because the later will end up going into SSLHostInfo in the future. At the moment, ChromeDnsCertProvenanceCheckerContext is just a skeleton to avoid putting too much real code in a plumbing job. BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66623 0039d316-1c4b-4281-b951-d872f2087c98
* Move creation of capturer, input stub into ChromotingHosthclam@chromium.org2010-11-171-36/+1
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/5065001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66390 0039d316-1c4b-4281-b951-d872f2087c98
* Inject MessageLoop into Capturerhclam@chromium.org2010-11-171-3/+6
| | | | | | | | | | | Simple patch to juse inject the message loop. BUG=None TEST=None Review URL: http://codereview.chromium.org/4971003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66387 0039d316-1c4b-4281-b951-d872f2087c98
* Implement input stub in the host side for chromotinghclam@chromium.org2010-11-161-5/+8
| | | | | | | | | | | Implement InputStub for the host. BUG=None TEST=None Review URL: http://codereview.chromium.org/4726003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66314 0039d316-1c4b-4281-b951-d872f2087c98
* base: Get rid of 'using' declaration of StringAppendF.tfarina@chromium.org2010-11-152-8/+8
| | | | | | | | | | | Update the callers to append base:: in the calls to StringAppendF. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/4974001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66116 0039d316-1c4b-4281-b951-d872f2087c98
* Fix warnings on Mac that has been reported by Eric.gene@google.com2010-11-111-4/+4
| | | | | | | | | | | | | | | | | | "warning: 'cloud_print::PrintSystemCUPS' has a field 'cloud_print::PrintSystemCUPS::printer_map_' whose type uses the anonymous namespace" For some reasons my machine did not produce such warnings and print_system_cups.cc compiled just fine. Eric, Could you please verify this fixes the issue? BUG=none TEST=Verify no warnings produced on Mac Review URL: http://codereview.chromium.org/4632004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65829 0039d316-1c4b-4281-b951-d872f2087c98
* Mark the CloudPrintURLFetcherBasicTest.HandleRawData and ↵ananta@chromium.org2010-11-111-2/+4
| | | | | | | | | | | | | CloudPrintURLFetcherRetryBackoffTest.GiveUp tests as flaky. Bug=62758 TBR=sanjeevr Review URL: http://codereview.chromium.org/4663003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65761 0039d316-1c4b-4281-b951-d872f2087c98
* Coverity: Initialize member variables.jhawkins@chromium.org2010-11-111-3/+8
| | | | | | | | | | CID=8455,8780,1127,11228,11229,13282 BUG=none TEST=none Review URL: http://codereview.chromium.org/4696002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65742 0039d316-1c4b-4281-b951-d872f2087c98
* Used GetProcAddress to load exported functions from prntvpt.dll instead of ↵sanjeevr@chromium.org2010-11-101-23/+25
| | | | | | | | | | | using DELAYLOAD. BUG=62421 TEST=ui_tests on XP without the XPS Framework installed should run. Review URL: http://codereview.chromium.org/4637004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65678 0039d316-1c4b-4281-b951-d872f2087c98
* Add print server name to the full name of the printer. This allows proxygene@google.com2010-11-091-34/+87
| | | | | | | | | | | to support printers with the same name on the different print servers. BUG=none TEST=none Review URL: http://codereview.chromium.org/4458003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65581 0039d316-1c4b-4281-b951-d872f2087c98
* base: Remove 'using' declaration of SStringPrintf.tfarina@chromium.org2010-11-081-1/+2
| | | | | | | | | | | Update the callers to append base:: when calling SStringPrintf. BUG=None TEST=locally and trybots Review URL: http://codereview.chromium.org/4330002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65446 0039d316-1c4b-4281-b951-d872f2087c98
* Coverity: Initialize member variables.jhawkins@chromium.org2010-11-062-2/+5
| | | | | | | | | | CID=13537,13538,13612 BUG=none TEST=none Review URL: http://codereview.chromium.org/4525008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65300 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build failure with -Dremoting=0phajdan.jr@chromium.org2010-11-051-0/+2
| | | | | | | | | | | Patch by Mike Glibert. Original review: http://codereview.chromium.org/4416001 BUG=61797 TEST=Build with -Dremoting=0 Review URL: http://codereview.chromium.org/4570001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65184 0039d316-1c4b-4281-b951-d872f2087c98
* Make CUPS cloud print proxy to support multiple print servers.gene@google.com2010-11-035-168/+446
| | | | | | | | | | | Add notifications for printer settings changed, and periodic update to check for new printers. BUG=none TEST=Make sure CP proxy works on Linux. Review URL: http://codereview.chromium.org/4233004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64970 0039d316-1c4b-4281-b951-d872f2087c98
* Add VideoReader and VideoWriter interfaces.sergeyu@chromium.org2010-11-031-5/+1
| | | | | | | | | | | Implemented VideoReader and VideoWriter for RTP and Protobuf. BUG=53986 TEST=None Review URL: http://codereview.chromium.org/4229003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64878 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed a bug where we were treating the "status" field in the printer list ↵sanjeevr@chromium.org2010-11-021-2/+6
| | | | | | | | | | | response JSON as an integer value. It is actually a string value that contains an integer. BUG=None TEST=Cloud Print proxy should not update printers with non-zero status every time it starts. Review URL: http://codereview.chromium.org/4269001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64706 0039d316-1c4b-4281-b951-d872f2087c98
* HTTP requests from the service process now use a non-empty user agent. Also ↵sanjeevr@chromium.org2010-11-025-7/+105
| | | | | | | | | | | appended a cloud-print specific string for cloud print requests. BUG=None TEST=Test user-agent string in Cloud Print proxy requests. Review URL: http://codereview.chromium.org/4176009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64693 0039d316-1c4b-4281-b951-d872f2087c98
* Convert implicit scoped_refptr constructor calls to explicit ones, part 1thakis@chromium.org2010-11-012-6/+6
| | | | | | | | | | | This CL was created automatically by this clang rewriter: http://codereview.appspot.com/2776043/ . I manually fixed a few rough spots of the rewriter output (doh1-3) and fixed all presubmit errors. BUG=28083 TEST=None Review URL: http://codereview.chromium.org/4192012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64573 0039d316-1c4b-4281-b951-d872f2087c98
* Re-landing issue 4202006 (http://codereview.chromium.org/4202006/show) which ↵sanjeevr@chromium.org2010-10-2913-573/+1044
| | | | | | | | | | | was reverted because of a Valgrind leak. Fixed the memory leak in the unit-test. BUG=None. TEST=Unit-tests, Valgrind bots. Review URL: http://codereview.chromium.org/4165013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64496 0039d316-1c4b-4281-b951-d872f2087c98
* Change LOG(INFO) to VLOG(1).gene@google.com2010-10-291-7/+7
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/4105007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64491 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64454 - Revert 64441 - Mac cloud print proxy work.scottbyer@google.com2010-10-291-1/+0
| | | | | | | | | | | | | | | | | | | Turn on use_cups for the Mac, add in the required library, and tweak the code to get it linking. There is still more work to do; this is just a gyp-oriented change to get things started. BUG=none TEST=All targets still build on all platforms. Review URL: http://codereview.chromium.org/4167006 TBR=scottbyer@chromium.org Review URL: http://codereview.chromium.org/4136011 TBR=scottbyer@google.com Review URL: http://codereview.chromium.org/4137013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64477 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64441 - Mac cloud print proxy work.scottbyer@google.com2010-10-291-0/+1
| | | | | | | | | | | | | | | | Turn on use_cups for the Mac, add in the required library, and tweak the code to get it linking. There is still more work to do; this is just a gyp-oriented change to get things started. BUG=none TEST=All targets still build on all platforms. Review URL: http://codereview.chromium.org/4167006 TBR=scottbyer@chromium.org Review URL: http://codereview.chromium.org/4136011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64454 0039d316-1c4b-4281-b951-d872f2087c98
* Mac cloud print proxy work.scottbyer@chromium.org2010-10-291-1/+0
| | | | | | | | | | | | | Turn on use_cups for the Mac, add in the required library, and tweak the code to get it linking. There is still more work to do; this is just a gyp-oriented change to get things started. BUG=none TEST=All targets still build on all platforms. Review URL: http://codereview.chromium.org/4167006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64441 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64359 - Created a CloudPrintURLFetcher class to wrap URLFetcher. This ↵jochen@chromium.org2010-10-2913-1033/+573
| | | | | | | | | | | | | | class implements a consistent retry policy based on URLFetcherProtectEntry and implements the standard error handling mechanism for all cloud print requests. Changed callers. BUG=None TEST=Unit-tests provided, test cloud print procy request backoff. Review URL: http://codereview.chromium.org/4202006 TBR=sanjeevr@chromium.org Review URL: http://codereview.chromium.org/4089011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64380 0039d316-1c4b-4281-b951-d872f2087c98
* Created a CloudPrintURLFetcher class to wrap URLFetcher. This class ↵sanjeevr@chromium.org2010-10-2913-573/+1033
| | | | | | | | | | | implements a consistent retry policy based on URLFetcherProtectEntry and implements the standard error handling mechanism for all cloud print requests. Changed callers. BUG=None TEST=Unit-tests provided, test cloud print procy request backoff. Review URL: http://codereview.chromium.org/4202006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64359 0039d316-1c4b-4281-b951-d872f2087c98
* Initial support for built-in DNS resolver/cache.agayev@chromium.org2010-10-281-1/+1
| | | | | | | | | BUG=60149 TEST=None Review URL: http://codereview.chromium.org/4216001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64271 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64202 - Initial support for built-in DNS resolver/cache.yusukes@chromium.org2010-10-281-1/+1
| | | | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3693001 TBR=agayev@chromium.org Review URL: http://codereview.chromium.org/4208002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64204 0039d316-1c4b-4281-b951-d872f2087c98
* Initial support for built-in DNS resolver/cache.agayev@chromium.org2010-10-281-1/+1
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3693001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64202 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Added some switches for testing/debugging.akalin@chromium.org2010-10-261-1/+3
| | | | | | | | | | | | | | | | Added back in --sync-invalidate-xmpp-login (now, not only in debug mode!). Added --sync-allow-insecure-xmpp-connection, which enables sync to connect to insecure XMPP servers (e.g., a local one). Changed --use-ssl-tcp to --sync-try-ssltcp-first-for-xmpp. BUG=None TEST=Manual Review URL: http://codereview.chromium.org/4158001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63903 0039d316-1c4b-4281-b951-d872f2087c98
* Move debug-related stuff from base to the base/debug directory and use thebrettw@chromium.org2010-10-261-2/+2
| | | | | | | | | | | | | | | | base::debug namespace. This splits apart debug_util into base/debugger and base/stack_trace There are still two functions in debug_util that I'm not sure what to do with. Since this uses the base::debug namespace, I removed the functions in debugger.h from the static class and just made them free functions in the namespace. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3945002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63859 0039d316-1c4b-4281-b951-d872f2087c98
* Move useful printing backend code from chrome/service/cloud_print to ↵thestig@chromium.org2010-10-2512-426/+98
| | | | | | | | | | printing/backend. BUG=none TEST=none Review URL: http://codereview.chromium.org/3945003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63772 0039d316-1c4b-4281-b951-d872f2087c98