Fix web_accesible_resources enforcement for Site Isolation.

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 193 matching lines @@
 
   for (size_t i = 0; i < arraysize(cases); ++i) {
     scoped_refptr<Extension> extension =
         CreateTestExtension(cases[i].name, cases[i].incognito_split_mode);
     extension_info_map_->AddExtension(
         extension.get(), base::Time::Now(), cases[i].incognito_enabled, false);
 
     // First test a main frame request.
     {
       // It doesn't matter that the resource doesn't exist. If the resource
-      // is blocked, we should see ADDRESS_UNREACHABLE. Otherwise, the request
+      // 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;
       } else {
-        EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request->status().error()) <<
-            cases[i].name;
+        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, request->status().error())
+            << 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;
       } else {
-        EXPECT_EQ(net::ERR_ADDRESS_UNREACHABLE, request->status().error()) <<
-            cases[i].name;
+        EXPECT_EQ(net::ERR_BLOCKED_BY_CLIENT, request->status().error())
+            << cases[i].name;
       }
     }
   }
 }
 
 void CheckForContentLengthHeader(net::URLRequest* request) {
   std::string content_length;
   request->GetResponseHeaderByName(net::HttpRequestHeaders::kContentLength,
                                   &content_length);
   EXPECT_FALSE(content_length.empty());
@@ skipping 142 matching lines @@
             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,
             DoRequest(*extension, relative_path.AsUTF8Unsafe()));
 }
 
 }  // namespace extensions