summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Collapse)AuthorAgeFilesLines
* Test server cleanup patch of death:phajdan.jr@chromium.org2010-08-1711-1006/+821
| | | | | | | | | | | | | | - reduce the number of different classes - clean up the internal code - modify the interface to expose less internal details (this will allow more flexibility with port numbers) TEST=many BUG=49680 Review URL: http://codereview.chromium.org/3080029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56405 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up the client certificate filtering code on Linuxdavidben@chromium.org2010-08-171-29/+26
| | | | | | | | | | | | | | | | | | | | | Instead of filtering over all certificates and then picking the ones suitable for client auth, NSS provides a function that does this in one go. In addition, delay checking for the private key until we actually send the certificate. While this means we may potentially offer a client certificate with no matching private key, such a store should not exist. This avoids requiring us authenticate to every certificate offered. In addition, it delays the password dialog, when we implement it, until after the user has designated that they are interested in a certificate. This mirrors Firefox's use of NSS. R=wtc BUG=none TEST=linux ssl client auth works Review URL: http://codereview.chromium.org/3177018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56404 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land part of r55416, minus actually moving the test_suite.h contents to a ↵brettw@chromium.org2010-08-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | .cc file. Cleanup in base. This moves the implementation (and a bunch of header file dependencies) from the multiprocess test and the test_suite headers to .cc files. Moves multiprocess_test to the test directory, and all of this stuff to the existing base_test_support project. I also used the base namespace. Previously other projects included this functionality just by #include because it was all inline, so I had to add dependencies on base_test_support in a few places. Moves and renames the command line switch this was using to base_switches. Move the base switch for process type to chrome switches. TEST=none BUG=none Review URL: http://codereview.chromium.org/3026055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56399 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56376 - This CL will introduce a new way to do exponential back-off ↵joi@chromium.org2010-08-1713-856/+9
| | | | | | | | | | | | | | | | | | | | | | on failure within Chromium. It is a network level implementation and should constitute a good enough bottleneck to manage every outgoing http request. Committing for malavv@google.com. Original review: http://codereview.chromium.org/2487001/show R=phajdan-jr BUG=none TEST=unit tests Review URL: http://codereview.chromium.org/3005049 TBR=joi@chromium.org Review URL: http://codereview.chromium.org/3165029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56393 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56384 - Don't resolve IP literals.vandebo@chromium.org2010-08-177-130/+91
| | | | | | | | | | | | | | For each resolution request this checks to see if this 'host' is a literal ip address. If so, it synthesises a struct addrinfo and returns it without adding it to the cache. BUG=39830 TEST=unit tests, new and old Review URL: http://codereview.chromium.org/3023048 TBR=vandebo@chromium.org Review URL: http://codereview.chromium.org/3115014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56385 0039d316-1c4b-4281-b951-d872f2087c98
* Don't resolve IP literals.vandebo@chromium.org2010-08-177-91/+130
| | | | | | | | | | | For each resolution request this checks to see if this 'host' is a literal ip address. If so, it synthesises a struct addrinfo and returns it without adding it to the cache. BUG=39830 TEST=unit tests, new and old Review URL: http://codereview.chromium.org/3023048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56384 0039d316-1c4b-4281-b951-d872f2087c98
* This CL will introduce a new way to do exponential back-off on failure within joi@chromium.org2010-08-1713-9/+856
| | | | | | | | | | | | | | | | Chromium. It is a network level implementation and should constitute a good enough bottleneck to manage every outgoing http request. Committing for malavv@google.com. Original review: http://codereview.chromium.org/2487001/show BUG=none TEST=unit tests Review URL: http://codereview.chromium.org/3005049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56376 0039d316-1c4b-4281-b951-d872f2087c98
* SPDY flow control: fix for WINDOW_UPDATEs arriving while request is being sent.agayev@chromium.org2010-08-178-76/+93
| | | | | | | | | BUG=48100 TEST=net_unittests Review URL: http://codereview.chromium.org/3048058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56355 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "DnsRRResolver: hoist inner class and callback on MessageLoop."agl@chromium.org2010-08-173-111/+49
| | | | | | (Everything goes to hell when the try servers don't work.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56344 0039d316-1c4b-4281-b951-d872f2087c98
* DnsRRResolver: hoist inner class and callback on MessageLoop.agl@chromium.org2010-08-173-49/+111
| | | | | | | | | | | | | | | | | This change moves the Response class to the top level to save other files from having to #include the header in order to get a pointer to a Response object. This change also modifies the semantics of resolution: the callback will now be made of the origin MessageLoop, rather than a random thread. TEST=net_unittests BUG=none http://codereview.chromium.org/3110015/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56342 0039d316-1c4b-4281-b951-d872f2087c98
* More uninitialized class member vars.finnur@chromium.org2010-08-173-5/+8
| | | | | | | | | | BUG=None TEST=None CID=1473, 5546, 11622 Review URL: http://codereview.chromium.org/3123009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56322 0039d316-1c4b-4281-b951-d872f2087c98
* Watch the Internet Explorer registry keys so we can detect proxy settings ↵eroman@chromium.org2010-08-174-18/+191
| | | | | | | | | | | | | | | | | changes faster. Previously we would poll on a background thread every 5 seconds (triggered by network activity) to check for changes. This meant there was a 5 second window during which new requests might still be using the old settings. With this CL, the settings are noticed almost immediately and the continuous polling is de-emphasized. (We still poll, but less often. This is a precaution since we are relying on implementation details of a winhttp function, and can't be sure it won't change in the future, or is even completely accurate right now). BUG=52120 TEST=Open chrome://net-internals/#requests. Request some webpage. Now make changes to the Internet explorer proxy settinsg. You should see a PROXY_CONFIG_CHANGED event emitted immediately after saving each change in the dialog box. Review URL: http://codereview.chromium.org/3161016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56305 0039d316-1c4b-4281-b951-d872f2087c98
* Revert the workaround for servers that use tiny DH keys.wtc@chromium.org2010-08-178-68/+69
| | | | | | | | | | | | | | | | | | Add the new error code ERR_SSL_WEAK_SERVER_KEY for these broken servers. Use the new SSL_RENEGOTIATE_TRANSITIONAL option. On the client side it is equivalent to SSL_RENEGOTIATE_UNRESTRICTED. R=agl BUG=51694 TEST=Visit https://portal-plumprod.cgc.enbridge.com and https://www.citylink.com.au. The network error page should display the error message: Error 129 (net::ERR_SSL_WEAK_SERVER_KEY): Unknown error. Review URL: http://codereview.chromium.org/3149012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56283 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Header cleanup in renderer_host.jhawkins@chromium.org2010-08-162-5/+5
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3164011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56237 0039d316-1c4b-4281-b951-d872f2087c98
* Remove test isolation enforcement code.phajdan.jr@chromium.org2010-08-161-1/+0
| | | | | | | | | | | | | | | | | | | I think it was a failed experiment, and it only ever worked for base_unittests. This removes some potentially risky code from LazyInstance that was only needed for the test isolation. The lesson from this experiment is that removing singletons works better than trying to make tests work fine even when singletons are overused. TEST=none BUG=12710 Review URL: http://codereview.chromium.org/3127012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56229 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug in the mock sockets. For SSL sockets, when they werembelshe@chromium.org2010-08-161-2/+2
| | | | | | | | | | | | | | | completing the connect asynchronously, we never set the connected_ flag to true. This is usually benign, because we don't often check the flag. BUG=none TEST=none Review URL: http://codereview.chromium.org/3107013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56219 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land just the project file changes from r55416. This makes projects that usebrettw@chromium.org2010-08-151-0/+1
| | | | | | | | | base test files dependent on test_support_base. TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56172 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup Registry API: part 3.tfarina@chromium.org2010-08-141-4/+6
| | | | | | | | | | | | - Remove the default arguments from the constructor. - Add a empty constructor to handle the case of the default arguments were used. BUG=44644 TEST=trybots Review URL: http://codereview.chromium.org/3172009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56123 0039d316-1c4b-4281-b951-d872f2087c98
* CommandLine: eliminate wstring-accepting AppendLooseValueevan@chromium.org2010-08-132-2/+2
| | | | | | | | Instead use AppendArg variants which accept a FilePath or an ASCII string. Review URL: http://codereview.chromium.org/3134008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56100 0039d316-1c4b-4281-b951-d872f2087c98
* Simple offline startup integration test.skrul@chromium.org2010-08-132-1/+38
| | | | | | | | | | This is a simple offline startup integration test. This change also includes the groundwork for more complex offline startup test cases, including the ability to enable and disable network connectivity as well as configure the mock sync server with a username. BUG=47918 Review URL: http://codereview.chromium.org/3078031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56087 0039d316-1c4b-4281-b951-d872f2087c98
* Added check for null delegate when a socket stream closes between ↵cdn@chromium.org2010-08-131-1/+1
| | | | | | | | | | DoResolveHost and DoResolveHostDone. BUG=51846 TEST=None Review URL: http://codereview.chromium.org/3145010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56076 0039d316-1c4b-4281-b951-d872f2087c98
* Initialize all data members in HTTPResponseInfo's new ctor and remove the ↵michaeln@chromium.org2010-08-131-0/+2
| | | | | | | | | | | related valgrind suppression. BUG=51940 TEST=n/a Review URL: http://codereview.chromium.org/3163010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56068 0039d316-1c4b-4281-b951-d872f2087c98
* Fix check for whether we need to consider client auth as partmbelshe@chromium.org2010-08-132-2/+2
| | | | | | | | | | | | | | of SSLClientSocket construction. Before we checked for if there was a client_cert present, but we really should check the boolean for SSLConfig.send_client_cert. BUG=none TEST=none Review URL: http://codereview.chromium.org/3155016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56056 0039d316-1c4b-4281-b951-d872f2087c98
* Update to NSS 3.12.7.wtc@chromium.org2010-08-1314-95/+100
| | | | | | | | | R=agl BUG=51694 TEST=No build errors or test failures. Review URL: http://codereview.chromium.org/3177012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56042 0039d316-1c4b-4281-b951-d872f2087c98
* Adding ability to sort by date to directory_lister.cc. Adding support for ↵dhg@chromium.org2010-08-132-8/+61
| | | | | | | | | | title and making so long filenames are ellipsis. BUG=chromium-os:5565 chromium-os:5566 TEST=manual Review URL: http://codereview.chromium.org/3177010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56036 0039d316-1c4b-4281-b951-d872f2087c98
* Redirects NetLog output to the log file, when the command linemmenke@chromium.org2010-08-132-0/+84
| | | | | | | | | | | | option "--log-net-log" is used. BUG= 50987 TEST= Run "chrome --log-net-log --enable-logging --log-level=0" And then check to make sure the log contains the NetLog events. Review URL: http://codereview.chromium.org/3040051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56021 0039d316-1c4b-4281-b951-d872f2087c98
* Emit an event to NetLog whenever the proxy settings change.eroman@chromium.org2010-08-135-121/+190
| | | | | | | | | | Also removes the operator<< on ProxyConfig. BUG=52004 Review URL: http://codereview.chromium.org/3144008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55999 0039d316-1c4b-4281-b951-d872f2087c98
* sync: Add sessions to protocol and chromiumsync python test server.jerrica@google.com2010-08-131-6/+6
| | | | | | | BUG=30519 Review URL: http://codereview.chromium.org/3107008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55973 0039d316-1c4b-4281-b951-d872f2087c98
* Skip CertDatabaseNSSTest.ImportFromPKCS12 on heapcheck, since the leaks ↵mattm@chromium.org2010-08-121-1/+6
| | | | | | | | | | | can't be suppressed cleanly. BUG=51988,51332,51330,51328 TEST=heapcheck bot should go green Review URL: http://codereview.chromium.org/3112007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55955 0039d316-1c4b-4281-b951-d872f2087c98
* Add NSS PKCS12 import/export functions to CertDatabase.mattm@chromium.org2010-08-127-1/+640
| | | | | | | | | | | Use sql: prefix when opening NSS UserDB (this will affect existing Chromeos installations, which had been using the old berkelydb format.) BUG=19991,51327,51328,51330,51332 TEST=net/base/cert_database_nss_unittest.cc Review URL: http://codereview.chromium.org/3018038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55916 0039d316-1c4b-4281-b951-d872f2087c98
* Net-internal's Javascript code no longer requires all enties have a unique ↵mmenke@chromium.org2010-08-121-6/+1
| | | | | | | | | | | | | | | | | | | | | | source id. It will assign entries with a source type of NONE their own unique negative id, which will never be displayed. Also, the id column in the Requests tab is now right-aligned. BUG= 48806 TEST= Run chromium while your ip address changes. Alternatively, add the following code to ConnectJob::LogConnectStart(), or somewhere else that looks promising: net_log().net_log()->AddEntry(net::NetLog::TYPE_NETWORK_IP_ADDRESSSES_CHANGED, base::TimeTicks::Now(), net::NetLog::Source(), net::NetLog::PHASE_NONE, NULL); Review URL: http://codereview.chromium.org/2883061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55900 0039d316-1c4b-4281-b951-d872f2087c98
* Uninitialized member vars and inlined constructors.finnur@chromium.org2010-08-125-5/+22
| | | | | | | | | | BUG=None TEST=None CID=3810, 8793, 8794 Review URL: http://codereview.chromium.org/3156003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55869 0039d316-1c4b-4281-b951-d872f2087c98
* Uninitialized member variable in UrlRequestJobMetrics.finnur@chromium.org2010-08-121-2/+5
| | | | | | | | | | BUG=None TEST=None CID=1470 Review URL: http://codereview.chromium.org/3146009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55862 0039d316-1c4b-4281-b951-d872f2087c98
* Uninitialized member vars in CacheDumper.finnur@chromium.org2010-08-121-4/+5
| | | | | | | | | | BUG=None TEST=None CID=4913 Review URL: http://codereview.chromium.org/3155006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55861 0039d316-1c4b-4281-b951-d872f2087c98
* Add WebSocket handshake message in net_logukai@chromium.org2010-08-126-0/+102
| | | | | | | | | BUG=none TEST=websocket handshake message shown in chrome://net-internals/#requests Review URL: http://codereview.chromium.org/3076043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55845 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Add NSS PKCS12 import/export functions to CertDatabase." which ↵mattm@chromium.org2010-08-117-640/+1
| | | | | | | | | | | | failed compile on chromeos. This reverts commit r55798. BUG=19991,51327,51328,51330,51332 Review URL: http://codereview.chromium.org/3169007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55804 0039d316-1c4b-4281-b951-d872f2087c98
* Add NSS PKCS12 import/export functions to CertDatabase.mattm@chromium.org2010-08-117-1/+640
| | | | | | | | | | | Use sql: prefix when opening NSS UserDB (this will affect existing Chromeos installations, which had been using the old berkelydb format.) BUG=19991,51327,51328,51330,51332 TEST=net/base/cert_database_nss_unittest.cc Review URL: http://codereview.chromium.org/3018038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55798 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Start cleaning up net/erg@google.com2010-08-1119-19/+89
| | | | | | | | | | | | url_request.h and http_response_info.h are some of the most included headers from net/ in chrome. Do what forward declaration we can in those headers. BUG=none TEST=none Review URL: http://codereview.chromium.org/3150003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55780 0039d316-1c4b-4281-b951-d872f2087c98
* net: add embedded DNSSEC chain support.agl@chromium.org2010-08-1114-8/+1822
| | | | | | | | | | | | | | | | | Now that the DNS root is signed we have a good trust path in several TLDs (including .org). This patch enables self-signed certificates to include a DNSSEC chain as an extension which proves a CERT record, containing the fingerprint of the public key. The format of the chain is still undecided, so this is only enabled with --enable-dnssec-certs. BUG=none TEST=net_unittests http://codereview.chromium.org/2806076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55771 0039d316-1c4b-4281-b951-d872f2087c98
* Update to NSS 3.12.7 and NSPR 4.8.6 (original review URLwtc@chromium.org2010-08-111-0/+5
| | | | | | | | | | | | | | | | | http://codereview.chromium.org/3135002/show). Map PR_INVALID_ARGUMENT_ERROR and SEC_ERROR_INVALID_ARGS to net::ERR_INVALID_ARGUMENT. This allows us to fail the SSL handshake with net::ERR_INVALID_ARGUMENT instead of the default net::ERR_FAILED when we connect to broken servers that use tiny keys for DHE cipher suites. R=agl BUG=51694 TEST=No build errors or test failures Review URL: http://codereview.chromium.org/3132005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55741 0039d316-1c4b-4281-b951-d872f2087c98
* Add a field trial for the cache WRT prefetchinggavinp@chromium.org2010-08-111-2/+14
| | | | | | | | | | | | | Prefetching might be putting stress on the cache concurrency. This fieldtrial explores if this is the case. R=rvargas BUG=none TEST=none Review URL: http://codereview.chromium.org/3133006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55725 0039d316-1c4b-4281-b951-d872f2087c98
* Fix flaky WebSocket crash with url-with-credential.htmlukai@chromium.org2010-08-112-5/+9
| | | | | | | | | | | | | | | | | | | | url-with-credential.html sometimes crash: [15193:15197:8597261003639:FATAL:net/socket_stream/socket_stream.cc(393)] Check failed: OK == result (0 vs. -3) Backtrace: StackTrace::StackTrace() [0x81a3fca] logging::LogMessage::~LogMessage() [0x814f89f] net::SocketStream::DoLoop() [0x93ca7f1] net::SocketStream::DoClose() [0x93cb171] This happens if the SocketStream is closed while waiting in STATE_TCP_CONNECT. If state is STATE_TCP_CONNECT and result is not OK, it's ok to close. BUG=50394 TEST=url-with-credential.html doesn't crash Review URL: http://codereview.chromium.org/3154003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55648 0039d316-1c4b-4281-b951-d872f2087c98
* Remove a bunch of extra includes.vandebo@chromium.org2010-08-116-11/+20
| | | | | | | | | BUG=extra includes TEST=still compiles Review URL: http://codereview.chromium.org/3125003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55638 0039d316-1c4b-4281-b951-d872f2087c98
* Filter out certificates that cannot be used as client certs on Windowsdavidben@chromium.org2010-08-102-0/+71
| | | | | | | | | | | | This matches the other platforms and IE8 in not offering expired certificates and checking the key usage extensions. BUG=45353 TEST=logging into websites with client certificates still works Review URL: http://codereview.chromium.org/2897006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55607 0039d316-1c4b-4281-b951-d872f2087c98
* Build fix for old glibc (<= 2.5) systems.agl@chromium.org2010-08-101-0/+6
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55592 0039d316-1c4b-4281-b951-d872f2087c98
* List TLS_DHE_RSA_WITH_AES_256_CBC_SHA afterwtc@chromium.org2010-08-104-2/+68
| | | | | | | | | | | | | | | | TLS_RSA_WITH_AES_256_CBC_SHA in ClientHello so that we communicate securely with some servers that use 256-bit DH keys. The proper fix is to upgrade to NSS 3.12.7 to pick up the DH key size checks. This is just a workaround. R=agl BUG=51694 TEST=none Review URL: http://codereview.chromium.org/3118002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55580 0039d316-1c4b-4281-b951-d872f2087c98
* SpdySession now closes all streams on receiving GoAway stream.erikchen@google.com2010-08-102-48/+19
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3109001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55506 0039d316-1c4b-4281-b951-d872f2087c98
* Removed spdy_network_transaction.h file.erikchen@google.com2010-08-097-714/+231
| | | | | | | | | | Finished migrating last unit tests to use http_network_transaction. BUG=43330 TEST=net_unittests Review URL: http://codereview.chromium.org/3091019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55454 0039d316-1c4b-4281-b951-d872f2087c98
* Remove all but one last caller of CommandLine::GetSwitchValue().evan@chromium.org2010-08-092-6/+9
| | | | | | Review URL: http://codereview.chromium.org/2868117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55429 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 55400 - Cleanup in base. This moves the implementation (and a bunch ↵nsylvain@chromium.org2010-08-093-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | of header file dependencies) from the multiprocess test and the test_suite headers to .cc files. Moves multiprocess_test to the test directory, and all of this stuff to the existing base_test_support project. I also used the base namespace. Previously other projects included this functionality just by #include because it was all inline, so I had to add dependencies on base_test_support in a few places. Moves and renames the command line switch this was using to base_switches. Move the base switch for process type to chrome switches. TEST=none BUG=none Review URL: http://codereview.chromium.org/3026055 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/3035062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55416 0039d316-1c4b-4281-b951-d872f2087c98