Move url_request_test_util into net namespace

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/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
@@ skipping 66 matching lines @@
   std::string error;
   ListValue resource_types;
   resource_types.Append(Value::CreateStringValue("main_frame"));
 
   scoped_ptr<WebRequestConditionAttribute> attribute =
       WebRequestConditionAttribute::Create(
           keys::kResourceTypeKey, &resource_types, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(attribute.get());
 
-  TestURLRequestContext context;
-  TestURLRequest url_request_ok(GURL("http://www.example.com"), NULL, &context);
+  net::TestURLRequestContext context;
+  net::TestURLRequest url_request_ok(
+      GURL("http://www.example.com"), NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
       ResourceType::MAIN_FRAME, NULL, -1, -1);
   EXPECT_TRUE(attribute->IsFulfilled(
       WebRequestRule::RequestData(&url_request_ok, ON_BEFORE_REQUEST)));
 
-  TestURLRequest url_request_fail(
+  net::TestURLRequest url_request_fail(
       GURL("http://www.example.com"), NULL, &context);
   content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
       ResourceType::SUB_FRAME, NULL, -1, -1);
   EXPECT_FALSE(attribute->IsFulfilled(
       WebRequestRule::RequestData(&url_request_fail, ON_BEFORE_REQUEST)));
 }
 
 TEST(WebRequestConditionAttributeTest, ContentType) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
 
   std::string error;
   scoped_ptr<WebRequestConditionAttribute> result;
 
   net::TestServer test_server(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       FilePath(FILE_PATH_LITERAL(
           "chrome/test/data/extensions/api_test/webrequest/declarative")));
   ASSERT_TRUE(test_server.Start());
 
-  TestURLRequestContext context;
-  TestDelegate delegate;
-  TestURLRequest url_request(test_server.GetURL("files/headers.html"),
-                                                &delegate, &context);
+  net::TestURLRequestContext context;
+  net::TestDelegate delegate;
+  net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
+                                                     &delegate, &context);
   url_request.Start();
   MessageLoop::current()->Run();
 
   ListValue content_types;
   content_types.Append(Value::CreateStringValue("text/plain"));
   scoped_ptr<WebRequestConditionAttribute> attribute_include =
       WebRequestConditionAttribute::Create(
           keys::kContentTypeKey, &content_types, &error);
   EXPECT_EQ("", error);
   ASSERT_TRUE(attribute_include.get());
@@ skipping 53 matching lines @@
   scoped_ptr<WebRequestConditionAttribute> first_party_attribute =
       WebRequestConditionAttribute::Create(keys::kThirdPartyKey,
                                            &value_false,
                                            &error);
   ASSERT_EQ("", error);
   ASSERT_TRUE(first_party_attribute.get());
 
   const GURL url_empty;
   const GURL url_a("http://a.com");
   const GURL url_b("http://b.com");
-  TestURLRequestContext context;
-  TestDelegate delegate;
-  TestURLRequest url_request(url_a, &delegate, &context);
+  net::TestURLRequestContext context;
+  net::TestDelegate delegate;
+  net::TestURLRequest url_request(url_a, &delegate, &context);
 
   for (unsigned int i = 1; i <= kLastActiveStage; i <<= 1) {
     if (!(kActiveStages & i))
       continue;
     const RequestStage stage = static_cast<RequestStage>(i);
     url_request.set_first_party_for_cookies(url_empty);
     EXPECT_FALSE(third_party_attribute->IsFulfilled(WebRequestRule::RequestData(
         &url_request, stage)));
     EXPECT_TRUE(first_party_attribute->IsFulfilled(WebRequestRule::RequestData(
         &url_request, stage)));
@@ skipping 64 matching lines @@
     single_stage_list.AppendString(active_stages[i].second);
     one_stage_attributes.push_back(
         WebRequestConditionAttribute::Create(keys::kStagesKey,
                                              &single_stage_list,
                                              &error).release());
     EXPECT_EQ("", error);
     ASSERT_TRUE(one_stage_attributes.back() != NULL);
   }
 
   const GURL url_empty;
-  TestURLRequestContext context;
-  TestDelegate delegate;
-  TestURLRequest url_request(url_empty, &delegate, &context);
+  net::TestURLRequestContext context;
+  net::TestDelegate delegate;
+  net::TestURLRequest url_request(url_empty, &delegate, &context);
 
   for (size_t i = 0; i < arraysize(active_stages); ++i) {
     EXPECT_FALSE(empty_attribute->IsFulfilled(WebRequestRule::RequestData(
        &url_request, active_stages[i].first)));
 
     for (size_t j = 0; j < one_stage_attributes.size(); ++j) {
       EXPECT_EQ(
           i == j,
           one_stage_attributes[j]->IsFulfilled(WebRequestRule::RequestData(
               &url_request, active_stages[i].first)));
@@ skipping 99 matching lines @@
 }  // namespace
 
 // Here we test WebRequestConditionAttributeRequestHeaders for matching
 // correctly against request headers. This test is not as extensive as
 // "ResponseHeaders" (below), because the header-matching code is shared
 // by both types of condition attributes, so it is enough to test it once.
 TEST(WebRequestConditionAttributeTest, RequestHeaders) {
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
 
-  TestURLRequestContext context;
-  TestDelegate delegate;
-  TestURLRequest url_request(GURL("http://example.com"),  // Dummy URL.
+  net::TestURLRequestContext context;
+  net::TestDelegate delegate;
+  net::TestURLRequest url_request(GURL("http://example.com"),  // Dummy URL.
                              &delegate, &context);

[wtc, 2012/11/12 21:50:49]

Adjust indentation.

[jochen (gone - plz use gerrit), 2012/11/13 09:17:57]

Done.

   url_request.SetExtraRequestHeaderByName(
       "Custom-header", "custom/value", true /* overwrite */);
   url_request.Start();
   MessageLoop::current()->Run();
 
   std::vector<std::vector<const std::string*> > tests;
   bool result = false;
 
   const RequestStage stage = ON_BEFORE_SEND_HEADERS;
 
@@ skipping 61 matching lines @@
   // Necessary for TestURLRequest.
   MessageLoop message_loop(MessageLoop::TYPE_IO);
 
   net::TestServer test_server(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       FilePath(FILE_PATH_LITERAL(
           "chrome/test/data/extensions/api_test/webrequest/declarative")));
   ASSERT_TRUE(test_server.Start());
 
-  TestURLRequestContext context;
-  TestDelegate delegate;
-  TestURLRequest url_request(test_server.GetURL("files/headers.html"),
-                             &delegate, &context);
+  net::TestURLRequestContext context;
+  net::TestDelegate delegate;
+  net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
+                                  &delegate, &context);
   url_request.Start();
   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
   // Custom-Header-C: valueC, valueD
   // Custom-Header-D:
   // in the response, but does not include "Non-existing: void".
@@ skipping 148 matching lines @@
     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 extensions