Migrating tests to use EmbeddedTestServer (misc)

extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 119 matching lines @@
                                                      ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
 
-  net::test_server::EmbeddedTestServer test_server;
+  net::EmbeddedTestServer test_server;
   test_server.ServeFilesFromDirectory(TestDataPath(
       "chrome/test/data/extensions/api_test/webrequest/declarative"));
-  ASSERT_TRUE(test_server.InitializeAndWaitUntilReady());
+  ASSERT_TRUE(test_server.Start());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
   scoped_ptr<net::URLRequest> url_request(context.CreateRequest(
       test_server.GetURL("/headers.html"), net::DEFAULT_PRIORITY, &delegate));
   url_request->Start();
   base::MessageLoop::current()->Run();
 
   base::ListValue content_types;
   content_types.Append(new base::StringValue("text/plain"));
@@ skipping 364 matching lines @@
 }
 
 // Here we test WebRequestConditionAttributeResponseHeaders for:
 // 1. Correct implementation of prefix/suffix/contains/equals matching.
 // 2. Performing logical disjunction (||) between multiple specifications.
 // 3. Negating the match in case of 'doesNotContainHeaders'.
 TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
 
-  net::test_server::EmbeddedTestServer test_server;
+  net::EmbeddedTestServer test_server;
   test_server.ServeFilesFromDirectory(TestDataPath(
       "chrome/test/data/extensions/api_test/webrequest/declarative"));
-  ASSERT_TRUE(test_server.InitializeAndWaitUntilReady());
+  ASSERT_TRUE(test_server.Start());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
   scoped_ptr<net::URLRequest> url_request(context.CreateRequest(
       test_server.GetURL("/headers.html"), net::DEFAULT_PRIORITY, &delegate));
   url_request->Start();
   base::MessageLoop::current()->Run();
 
   // In all the tests below we assume that the server includes the headers
   // Custom-Header: custom/value
@@ skipping 166 matching lines @@
   };
   const size_t kExistingSize[] = { arraysize(kExisting) };
   GetArrayAsVector(kExisting, kExistingSize, 1u, &tests);
   MatchAndCheck(tests, keys::kExcludeResponseHeadersKey, stage,
                 url_request.get(), &result);
   EXPECT_FALSE(result);
 }
 
 }  // namespace
 }  // namespace extensions