Switch to EmbeddedTestServer to avoid flakiness.

chrome/browser/extensions/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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/request_priority.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::DictionaryValue;
 using base::FundamentalValue;
 using base::ListValue;
 using base::StringValue;
 using base::Value;
 
-namespace {
-const char kUnknownConditionName[] = "unknownType";
-}  // namespace
-
 namespace extensions {
 
 namespace keys = declarative_webrequest_constants;
 
+namespace {
+const char kUnknownConditionName[] = "unknownType";
+
+base::FilePath TestDataPath(base::StringPiece relative_to_src) {
+  base::FilePath src_dir;
+  CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &src_dir));
+  return src_dir.AppendASCII(relative_to_src);
+}
+
 TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
   base::StringValue string_value("main_frame");
   base::ListValue resource_types;
   resource_types.Append(new base::StringValue("main_frame"));
 
@@ skipping 61 matching lines @@
                                                      ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
   base::MessageLoopForIO message_loop;
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
 
-  net::SpawnedTestServer test_server(
-      net::SpawnedTestServer::TYPE_HTTP,
-      net::SpawnedTestServer::kLocalhost,
-      base::FilePath(FILE_PATH_LITERAL(
-          "chrome/test/data/extensions/api_test/webrequest/declarative")));
-  ASSERT_TRUE(test_server.Start());
+  net::test_server::EmbeddedTestServer test_server;
+  test_server.ServeFilesFromDirectory(TestDataPath(
+      "chrome/test/data/extensions/api_test/webrequest/declarative"));
+  ASSERT_TRUE(test_server.InitializeAndWaitUntilReady());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
-  net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
+  net::TestURLRequest url_request(test_server.GetURL("/headers.html"),
                                   net::DEFAULT_PRIORITY,
                                   &delegate,
                                   &context);
   url_request.Start();
   base::MessageLoop::current()->Run();
 
   base::ListValue content_types;
   content_types.Append(new base::StringValue("text/plain"));
   scoped_refptr<const WebRequestConditionAttribute> attribute_include =
       WebRequestConditionAttribute::Create(
@@ skipping 359 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::SpawnedTestServer test_server(
-      net::SpawnedTestServer::TYPE_HTTP,
-      net::SpawnedTestServer::kLocalhost,
-      base::FilePath(FILE_PATH_LITERAL(
-          "chrome/test/data/extensions/api_test/webrequest/declarative")));
-  ASSERT_TRUE(test_server.Start());
+  net::test_server::EmbeddedTestServer test_server;
+  test_server.ServeFilesFromDirectory(TestDataPath(
+      "chrome/test/data/extensions/api_test/webrequest/declarative"));
+  ASSERT_TRUE(test_server.InitializeAndWaitUntilReady());
 
   net::TestURLRequestContext context;
   net::TestDelegate delegate;
-  net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
+  net::TestURLRequest url_request(test_server.GetURL("/headers.html"),
                                   net::DEFAULT_PRIORITY,
                                   &delegate,
                                   &context);
   url_request.Start();
   base::MessageLoop::current()->Run();
 
   // In all the tests below we assume that the server includes the headers
   // Custom-Header: custom/value
   // Custom-Header-B: valueA
   // Custom-Header-B: valueB
@@ skipping 150 matching lines @@
     keys::kNameEqualsKey, "custom-header-b",
     keys::kValueEqualsKey, "valueB"
   };
   const size_t kExistingSize[] = { arraysize(kExisting) };
   GetArrayAsVector(kExisting, kExistingSize, 1u, &tests);
   MatchAndCheck(
       tests, keys::kExcludeResponseHeadersKey, stage, &url_request, &result);
   EXPECT_FALSE(result);
 }
 
+}  // namespace

[vabr (Chromium), 2014/02/04 08:19:12]

Did you put the whole test into anonymous namespace on purpose? I guess that
makes sense, because it's not exported anywhere, it's just the first time I see
it.

[Jeffrey Yasskin, 2014/02/04 08:27:17]

Yeah. It's nice to do that because it ensures that we can write helper functions
anywhere in the file without worrying that they'll collide with other helper
functions. If we need to use FRIEND_TEST, we can't put that test in an anonymous
namespace, but otherwise, it's a good practice.

 }  // namespace extensions