Revert of Revert of Introduce HostID and de-couple Extensions from "script injection System" [browser side]

chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_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_rules_registry.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 694 matching lines @@
   URLMatcher matcher;
   scoped_ptr<WebRequestConditionSet> conditions =
       WebRequestConditionSet::Create(
           NULL, matcher.condition_factory(), rule.conditions, &error);
   ASSERT_TRUE(error.empty()) << error;
   ASSERT_TRUE(conditions);
 
   bool bad_message = false;
   scoped_ptr<WebRequestActionSet> actions =
       WebRequestActionSet::Create(
-          NULL, NULL, rule.actions, &error, &bad_message);
+          NULL, HostID(), NULL, rule.actions, &error, &bad_message);
   ASSERT_TRUE(error.empty()) << error;
   ASSERT_FALSE(bad_message);
   ASSERT_TRUE(actions);
 
   EXPECT_FALSE(WebRequestRulesRegistry::StageChecker(
       conditions.get(), actions.get(), &error));
   EXPECT_THAT(error, HasSubstr("no time in the request life-cycle"));
   EXPECT_THAT(error, HasSubstr(actions->actions().back()->GetName()));
 }
 
 TEST(WebRequestRulesRegistrySimpleTest, HostPermissionsChecker) {
   const char kAction[] =  // This action requires all URLs host permission.
       "{                                                             \n"
       "  \"instanceType\": \"declarativeWebRequest.RedirectRequest\",\n"
       "  \"redirectUrl\": \"http://bar.com\"                         \n"
       "}                                                             ";
   scoped_ptr<base::Value> action_value(base::JSONReader::Read(kAction));
   ASSERT_TRUE(action_value);
 
   WebRequestActionSet::AnyVector actions;
   actions.push_back(linked_ptr<base::Value>(action_value.release()));
   ASSERT_TRUE(actions.back().get());
 
   std::string error;
   bool bad_message = false;
   scoped_ptr<WebRequestActionSet> action_set(
-      WebRequestActionSet::Create(NULL, NULL, actions, &error, &bad_message));
+      WebRequestActionSet::Create(
+          NULL, HostID(), NULL, actions, &error, &bad_message));
   ASSERT_TRUE(error.empty()) << error;
   ASSERT_FALSE(bad_message);
   ASSERT_TRUE(action_set);
 
   scoped_refptr<Extension> extension_no_url(
       LoadManifest("permissions", "web_request_no_host.json"));
   scoped_refptr<Extension> extension_some_urls(
       LoadManifest("permissions", "web_request_com_host_permissions.json"));
   scoped_refptr<Extension> extension_all_urls(
       LoadManifest("permissions", "web_request_all_host_permissions.json"));
@@ skipping 60 matching lines @@
   // This is a correct match.
   GURL url2("http://foo.com/index.html");
   scoped_ptr<net::URLRequest> request2(context.CreateRequest(
       url2, net::DEFAULT_PRIORITY, NULL, NULL));
   WebRequestData request_data2(request2.get(), ON_BEFORE_REQUEST);
   deltas = registry->CreateDeltas(NULL, request_data2, false);
   EXPECT_EQ(1u, deltas.size());
 }
 
 }  // namespace extensions