Migrating tests to use EmbeddedTestServer (misc)

components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
index 4492a870a0e6ac2945f5a1b93ef9e0c6af060fbe..e087cb0ce293f2ecaa01a1aa7b8f92b62a4b65e8 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_interceptor_unittest.cc
@@ -194,8 +194,8 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
         "components/test/data/data_reduction_proxy/direct");
     proxy_.ServeFilesFromDirectory(proxy_file_path);
     direct_.ServeFilesFromDirectory(direct_file_path);
-    ASSERT_TRUE(proxy_.InitializeAndWaitUntilReady());
-    ASSERT_TRUE(direct_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(proxy_.Start());
+    ASSERT_TRUE(direct_.Start());
 
     test_context_ =
         DataReductionProxyTestContext::Builder()
@@ -228,17 +228,15 @@ class DataReductionProxyInterceptorWithServerTest : public testing::Test {
     return context_;
   }
 
-  const net::test_server::EmbeddedTestServer& direct() {
-    return direct_;
-  }
+  const net::EmbeddedTestServer& direct() { return direct_; }
 
  private:
   base::MessageLoopForIO message_loop_;
   net::TestNetLog net_log_;
   net::TestNetworkDelegate network_delegate_;
   net::TestURLRequestContext context_;
-  net::test_server::EmbeddedTestServer proxy_;
-  net::test_server::EmbeddedTestServer direct_;
+  net::EmbeddedTestServer proxy_;
+  net::EmbeddedTestServer direct_;
   scoped_ptr<net::ProxyService> proxy_service_;
   scoped_ptr<net::URLRequestJobFactory> job_factory_;
   scoped_ptr<DataReductionProxyTestContext> test_context_;