Adjust callers and networking delegates in chrome/ to modified APIs

chrome/browser/extensions/extension_protocols_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_util.h"
@@ skipping 135 matching lines @@
         true,    // allow_download
         false,   // is_async
         false);  // is_using_lofi
     request->Start();
     base::RunLoop().Run();
   }
 
   // Helper method to create a URLRequest, call StartRequest on it, and return
   // the result. If |extension| hasn't already been added to
   // |extension_info_map_|, this will add it.
-  net::URLRequestStatus::Status DoRequest(const Extension& extension,
-                                          const std::string& relative_path) {
+  int DoRequest(const Extension& extension, const std::string& relative_path) {
     if (!extension_info_map_->extensions().Contains(extension.id())) {
       extension_info_map_->AddExtension(&extension,
                                         base::Time::Now(),
                                         false,   // incognito_enabled
                                         false);  // notifications_disabled
     }
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension.GetResourceURL(relative_path), net::DEFAULT_PRIORITY,
             &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MAIN_FRAME);
-    return request->status().status();
+    return test_delegate_.request_status();
   }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<InfoMap> extension_info_map_;
   net::URLRequestJobFactoryImpl job_factory_;
   const net::URLRequestJobFactory* old_factory_;
   net::TestDelegate test_delegate_;
   net::TestURLRequestContext test_url_request_context_;
   content::MockResourceContext resource_context_;
@@ skipping 32 matching lines @@
     // First test a main frame request.
     {
       // It doesn't matter that the resource doesn't exist. If the resource
       // is blocked, we should see BLOCKED_BY_CLIENT. Otherwise, the request
       // should just fail because the file doesn't exist.
       std::unique_ptr<net::URLRequest> request(
           resource_context_.GetRequestContext()->CreateRequest(
               extension->GetResourceURL("404.html"), net::DEFAULT_PRIORITY,
               &test_delegate_));
       StartRequest(request.get(), content::RESOURCE_TYPE_MAIN_FRAME);
-      EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
 
       if (cases[i].should_allow_main_frame_load) {
-        EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request->status().error()) <<
-            cases[i].name;
+        EXPECT_EQ(net::ERR_FILE_NOT_FOUND, test_delegate_.request_status())
+            << cases[i].name;
       } else {
-        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, request->status().error())
+        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, test_delegate_.request_status())
             << cases[i].name;
       }
     }
 
     // Now do a subframe request.
     {
       std::unique_ptr<net::URLRequest> request(
           resource_context_.GetRequestContext()->CreateRequest(
               extension->GetResourceURL("404.html"), net::DEFAULT_PRIORITY,
               &test_delegate_));
       StartRequest(request.get(), content::RESOURCE_TYPE_SUB_FRAME);
-      EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
 
       if (cases[i].should_allow_sub_frame_load) {
-        EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request->status().error()) <<
-            cases[i].name;
+        EXPECT_EQ(net::ERR_FILE_NOT_FOUND, test_delegate_.request_status())
+            << cases[i].name;
       } else {
-        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, request->status().error())
+        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, test_delegate_.request_status())
             << cases[i].name;
       }
     }
   }
 }
 
 void CheckForContentLengthHeader(net::URLRequest* request) {
   std::string content_length;
   request->GetResponseHeaderByName(net::HttpRequestHeaders::kContentLength,
                                   &content_length);
@@ skipping 15 matching lines @@
                                     false,
                                     false);
 
   // First test it with the extension enabled.
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("webstore_icon_16.png"),
             net::DEFAULT_PRIORITY, &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MEDIA);
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+    EXPECT_EQ(net::OK, test_delegate_.request_status());
     CheckForContentLengthHeader(request.get());
   }
 
   // And then test it with the extension disabled.
   extension_info_map_->RemoveExtension(extension->id(),
                                        UnloadedExtensionInfo::REASON_DISABLE);
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("webstore_icon_16.png"),
             net::DEFAULT_PRIORITY, &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MEDIA);
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+    EXPECT_EQ(net::OK, test_delegate_.request_status());
     CheckForContentLengthHeader(request.get());
   }
 }
 
 // Tests that a URL request for resource from an extension returns a few
 // expected response headers.
 TEST_F(ExtensionProtocolTest, ResourceRequestResponseHeaders) {
   // Register a non-incognito extension protocol handler.
   SetProtocolHandler(false);
 
   scoped_refptr<Extension> extension = CreateTestResponseHeaderExtension();
   extension_info_map_->AddExtension(extension.get(),
                                     base::Time::Now(),
                                     false,
                                     false);
 
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("test.dat"), net::DEFAULT_PRIORITY,
             &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MEDIA);
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+    EXPECT_EQ(net::OK, test_delegate_.request_status());
 
     // Check that cache-related headers are set.
     std::string etag;
     request->GetResponseHeaderByName("ETag", &etag);
     EXPECT_TRUE(base::StartsWith(etag, "\"", base::CompareCase::SENSITIVE));
     EXPECT_TRUE(base::EndsWith(etag, "\"", base::CompareCase::SENSITIVE));
 
     std::string revalidation_header;
     request->GetResponseHeaderByName("cache-control", &revalidation_header);
     EXPECT_EQ("no-cache", revalidation_header);
@@ skipping 20 matching lines @@
 
   // All MAIN_FRAME requests should succeed. SUB_FRAME requests that are not
   // explicitly listed in web_accesible_resources or same-origin to the parent
   // should not succeed.
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("test.dat"), net::DEFAULT_PRIORITY,
             &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MAIN_FRAME);
-    EXPECT_EQ(net::URLRequestStatus::SUCCESS, request->status().status());
+    EXPECT_EQ(net::OK, test_delegate_.request_status());
   }
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("test.dat"), net::DEFAULT_PRIORITY,
             &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_SUB_FRAME);
-    EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
+    EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, test_delegate_.request_status());
   }
 
   // And subresource types, such as media, should fail.
   {
     std::unique_ptr<net::URLRequest> request(
         resource_context_.GetRequestContext()->CreateRequest(
             extension->GetResourceURL("test.dat"), net::DEFAULT_PRIORITY,
             &test_delegate_));
     StartRequest(request.get(), content::RESOURCE_TYPE_MEDIA);
-    EXPECT_EQ(net::URLRequestStatus::FAILED, request->status().status());
+    EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, test_delegate_.request_status());
   }
 }
 
 
 TEST_F(ExtensionProtocolTest, MetadataFolder) {
   SetProtocolHandler(false);
 
   base::FilePath extension_dir = GetTestPath("metadata_folder");
   std::string error;
   scoped_refptr<Extension> extension =
       file_util::LoadExtension(extension_dir, Manifest::INTERNAL,
                                Extension::NO_FLAGS, &error);
   ASSERT_NE(extension.get(), nullptr) << "error: " << error;
 
   // Loading "/test.html" should succeed.
-  EXPECT_EQ(net::URLRequestStatus::SUCCESS, DoRequest(*extension, "test.html"));
+  EXPECT_EQ(net::OK, DoRequest(*extension, "test.html"));
 
   // Loading "/_metadata/verified_contents.json" should fail.
   base::FilePath relative_path =
       base::FilePath(kMetadataFolder).Append(kVerifiedContentsFilename);
   EXPECT_TRUE(base::PathExists(extension_dir.Append(relative_path)));
-  EXPECT_EQ(net::URLRequestStatus::FAILED,
+  EXPECT_EQ(net::ERR_FAILED,
             DoRequest(*extension, relative_path.AsUTF8Unsafe()));
 
   // Loading "/_metadata/a.txt" should also fail.
   relative_path = base::FilePath(kMetadataFolder).AppendASCII("a.txt");
   EXPECT_TRUE(base::PathExists(extension_dir.Append(relative_path)));
-  EXPECT_EQ(net::URLRequestStatus::FAILED,
+  EXPECT_EQ(net::ERR_FAILED,
             DoRequest(*extension, relative_path.AsUTF8Unsafe()));
 }
 
 }  // namespace extensions