Revert r74632 "Reland r74561 after fixing ChromeOS build breakage."

This reverts commit f19e6d524e086ed8182a475680e931a9a870d2a8.

TBR=willchan@chromium.org
BUG=none
TEST=chromeos pfq bot should cycle green

Review URL: http://codereview.chromium.org/6512009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74728 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 23 insertions, 23 deletions

diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 6502674..4d7a68a 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -36,12 +36,12 @@ void TestShellRequestContext::Init(
     const FilePath& cache_path,
     net::HttpCache::Mode cache_mode,
     bool no_proxy) {
-  set_cookie_store(new net::CookieMonster(NULL, NULL));
-  set_cookie_policy(new net::StaticCookiePolicy());
+  cookie_store_ = new net::CookieMonster(NULL, NULL);
+  cookie_policy_ = new net::StaticCookiePolicy();
 
   // hard-code A-L and A-C for test shells
-  set_accept_language("en-us,en");
-  set_accept_charset("iso-8859-1,*,utf-8");
+  accept_language_ = "en-us,en";
+  accept_charset_ = "iso-8859-1,*,utf-8";
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Use no proxy to avoid ProxyConfigServiceLinux.
@@ -60,41 +60,41 @@ void TestShellRequestContext::Init(
       net::ProxyService::CreateSystemProxyConfigService(
           MessageLoop::current(), NULL));
 #endif
-  set_host_resolver(
+  host_resolver_ =
       net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
-                                    NULL, NULL));
-  set_cert_verifier(new net::CertVerifier);
-  set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(
-      proxy_config_service.release(), 0, NULL));
-  set_ssl_config_service(net::SSLConfigService::CreateSystemSSLConfigService());
+                                    NULL, NULL);
+  cert_verifier_ = new net::CertVerifier;
+  proxy_service_ = net::ProxyService::CreateUsingSystemProxyResolver(
+      proxy_config_service.release(), 0, NULL);
+  ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService();
 
-  set_http_auth_handler_factory(net::HttpAuthHandlerFactory::CreateDefault(
-      host_resolver()));
+  http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(
+      host_resolver_);
 
   net::HttpCache::DefaultBackend* backend = new net::HttpCache::DefaultBackend(
       cache_path.empty() ? net::MEMORY_CACHE : net::DISK_CACHE,
       cache_path, 0, SimpleResourceLoaderBridge::GetCacheThread());
 
   net::HttpCache* cache =
-      new net::HttpCache(host_resolver(), cert_verifier(), NULL, NULL,
-                         proxy_service(), ssl_config_service(),
-                         http_auth_handler_factory(), NULL, NULL, backend);
+      new net::HttpCache(host_resolver_, cert_verifier_, NULL, NULL,
+                         proxy_service_, ssl_config_service_,
+                         http_auth_handler_factory_, NULL, NULL, backend);
 
   cache->set_mode(cache_mode);
-  set_http_transaction_factory(cache);
+  http_transaction_factory_ = cache;
 
-  set_ftp_transaction_factory(new net::FtpNetworkLayer(host_resolver()));
+  ftp_transaction_factory_ = new net::FtpNetworkLayer(host_resolver_);
 
   blob_storage_controller_.reset(new webkit_blob::BlobStorageController());
 }
 
 TestShellRequestContext::~TestShellRequestContext() {
-  delete ftp_transaction_factory();
-  delete http_transaction_factory();
-  delete http_auth_handler_factory();
-  delete cookie_policy();
-  delete cert_verifier();
-  delete host_resolver();
+  delete ftp_transaction_factory_;
+  delete http_transaction_factory_;
+  delete http_auth_handler_factory_;
+  delete static_cast<net::StaticCookiePolicy*>(cookie_policy_);
+  delete cert_verifier_;
+  delete host_resolver_;
 }
 
 const std::string& TestShellRequestContext::GetUserAgent(