Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / net / connection_tester_unittest.cc

diff --git a/src/chrome/browser/net/connection_tester_unittest.cc b/src/chrome/browser/net/connection_tester_unittest.cc
index f5ecb59..ff5fe67 100644 (file)
--- a/src/chrome/browser/net/connection_tester_unittest.cc
+++ b/src/chrome/browser/net/connection_tester_unittest.cc
@@ -5,9 +5,10 @@
 #include "chrome/browser/net/connection_tester.h"
 
 #include "base/prefs/testing_pref_service.h"
+#include "content/public/browser/cookie_store_factory.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/browser/cookie_store_factory.h"
 #include "net/cert/mock_cert_verifier.h"
-#include "net/cookies/cookie_monster.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_auth_handler_factory.h"
@@ -20,6 +21,7 @@
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
@@ -38,22 +40,22 @@ class ConnectionTesterDelegate : public ConnectionTester::Delegate {
        completed_connection_test_suite_count_(0) {
   }
 
-  virtual void OnStartConnectionTestSuite() OVERRIDE {
+  void OnStartConnectionTestSuite() override {
     start_connection_test_suite_count_++;
   }
 
-  virtual void OnStartConnectionTestExperiment(
-      const ConnectionTester::Experiment& experiment) OVERRIDE {
+  void OnStartConnectionTestExperiment(
+      const ConnectionTester::Experiment& experiment) override {
     start_connection_test_experiment_count_++;
   }
 
-  virtual void OnCompletedConnectionTestExperiment(
+  void OnCompletedConnectionTestExperiment(
       const ConnectionTester::Experiment& experiment,
-      int result) OVERRIDE {
+      int result) override {
     completed_connection_test_experiment_count_++;
   }
 
-  virtual void OnCompletedConnectionTestSuite() OVERRIDE {
+  void OnCompletedConnectionTestSuite() override {
     completed_connection_test_suite_count_++;
     base::MessageLoop::current()->Quit();
   }
@@ -88,14 +90,11 @@ class ConnectionTesterDelegate : public ConnectionTester::Delegate {
 class ConnectionTesterTest : public PlatformTest {
  public:
   ConnectionTesterTest()
-      : message_loop_(base::MessageLoop::TYPE_IO),
-        io_thread_(BrowserThread::IO, &message_loop_),
+      : io_thread_(BrowserThread::IO, &message_loop_),
         test_server_(net::SpawnedTestServer::TYPE_HTTP,
                      net::SpawnedTestServer::kLocalhost,
                      // Nothing is read in this directory.
-                     base::FilePath(FILE_PATH_LITERAL("chrome"))),
-        proxy_script_fetcher_context_(new net::URLRequestContext) {
-    InitializeRequestContext();
+                     base::FilePath(FILE_PATH_LITERAL("chrome"))) {
   }
 
  protected:
@@ -104,59 +103,18 @@ class ConnectionTesterTest : public PlatformTest {
   // SSLClientAuthCache calls RemoveObserver when destroyed, but if the
   // MessageLoop is already destroyed, then the RemoveObserver will be a
   // no-op, and the ObserverList will contain invalid entries.
-  base::MessageLoop message_loop_;
+  base::MessageLoopForIO message_loop_;
   content::TestBrowserThread io_thread_;
   net::SpawnedTestServer test_server_;
+  net::TestURLRequestContext proxy_script_fetcher_context_;
   ConnectionTesterDelegate test_delegate_;
-  net::MockHostResolver host_resolver_;
-  scoped_ptr<net::CertVerifier> cert_verifier_;
-  scoped_ptr<net::TransportSecurityState> transport_security_state_;
-  scoped_ptr<net::ProxyService> proxy_service_;
-  scoped_refptr<net::SSLConfigService> ssl_config_service_;
-  scoped_ptr<net::HttpTransactionFactory> http_transaction_factory_;
-  net::HttpAuthHandlerRegistryFactory http_auth_handler_factory_;
-  net::HttpServerPropertiesImpl http_server_properties_impl_;
-  scoped_ptr<net::URLRequestContext> proxy_script_fetcher_context_;
-
- private:
-  void InitializeRequestContext() {
-    proxy_script_fetcher_context_->set_host_resolver(&host_resolver_);
-    cert_verifier_.reset(new net::MockCertVerifier);
-    transport_security_state_.reset(new net::TransportSecurityState);
-    proxy_script_fetcher_context_->set_cert_verifier(cert_verifier_.get());
-    proxy_script_fetcher_context_->set_transport_security_state(
-        transport_security_state_.get());
-    proxy_script_fetcher_context_->set_http_auth_handler_factory(
-        &http_auth_handler_factory_);
-    proxy_service_.reset(net::ProxyService::CreateDirect());
-    proxy_script_fetcher_context_->set_proxy_service(proxy_service_.get());
-    ssl_config_service_ = new net::SSLConfigServiceDefaults;
-    net::HttpNetworkSession::Params session_params;
-    session_params.host_resolver = &host_resolver_;
-    session_params.cert_verifier = cert_verifier_.get();
-    session_params.transport_security_state = transport_security_state_.get();
-    session_params.http_auth_handler_factory = &http_auth_handler_factory_;
-    session_params.ssl_config_service = ssl_config_service_.get();
-    session_params.proxy_service = proxy_service_.get();
-    session_params.http_server_properties =
-        http_server_properties_impl_.GetWeakPtr();
-    scoped_refptr<net::HttpNetworkSession> network_session(
-        new net::HttpNetworkSession(session_params));
-    http_transaction_factory_.reset(
-        new net::HttpNetworkLayer(network_session.get()));
-    proxy_script_fetcher_context_->set_http_transaction_factory(
-        http_transaction_factory_.get());
-    // In-memory cookie store.
-    proxy_script_fetcher_context_->set_cookie_store(
-        new net::CookieMonster(NULL, NULL));
-  }
 };
 
 TEST_F(ConnectionTesterTest, RunAllTests) {
   ASSERT_TRUE(test_server_.Start());
 
   ConnectionTester tester(&test_delegate_,
-                          proxy_script_fetcher_context_.get(),
+                          &proxy_script_fetcher_context_,
                           NULL);
 
   // Start the test suite on URL "echoall".
@@ -183,7 +141,7 @@ TEST_F(ConnectionTesterTest, DeleteWhileInProgress) {
 
   scoped_ptr<ConnectionTester> tester(
       new ConnectionTester(&test_delegate_,
-                           proxy_script_fetcher_context_.get(),
+                           &proxy_script_fetcher_context_,
                            NULL));
 
   // Start the test suite on URL "echoall".