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

chrome/browser/extensions/api/declarative_webrequest/webrequest_action_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_action.h"
 
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 40 matching lines @@
        ++it) {
     const base::DictionaryValue* dict;
     CHECK((*it)->GetAsDictionary(&dict));
     actions.push_back(linked_ptr<base::Value>(dict->DeepCopy()));
   }
 
   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));
   EXPECT_EQ("", error);
   EXPECT_FALSE(bad_message);
   CHECK(action_set);
   return action_set.Pass();
 }
 
 }  // namespace
 
 namespace keys = declarative_webrequest_constants;
 
@@ skipping 108 matching lines @@
 
 TEST(WebRequestActionTest, CreateAction) {
   std::string error;
   bool bad_message = false;
   scoped_refptr<const WebRequestAction> result;
 
   // Test wrong data type passed.
   error.clear();
   base::ListValue empty_list;
   result = WebRequestAction::Create(
-      NULL, NULL, empty_list, &error, &bad_message);
+      NULL, HostID(), NULL, empty_list, &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_FALSE(result.get());
 
   // Test missing instanceType element.
   base::DictionaryValue input;
   error.clear();
-  result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestAction::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_FALSE(result.get());
 
   // Test wrong instanceType element.
   input.SetString(keys::kInstanceTypeKey, kUnknownActionType);
   error.clear();
-  result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestAction::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_NE("", error);
   EXPECT_FALSE(result.get());
 
   // Test success
   input.SetString(keys::kInstanceTypeKey, keys::kCancelRequestType);
   error.clear();
-  result = WebRequestAction::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestAction::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(bad_message);
   ASSERT_TRUE(result.get());
   EXPECT_EQ(WebRequestAction::ACTION_CANCEL_REQUEST, result->type());
 }
 
 TEST(WebRequestActionTest, CreateActionSet) {
   std::string error;
   bool bad_message = false;
   scoped_ptr<WebRequestActionSet> result;
 
   WebRequestActionSet::AnyVector input;
 
   // Test empty input.
   error.clear();
-  result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestActionSet::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_TRUE(error.empty()) << error;
   EXPECT_FALSE(bad_message);
   ASSERT_TRUE(result.get());
   EXPECT_TRUE(result->actions().empty());
   EXPECT_EQ(std::numeric_limits<int>::min(), result->GetMinimumPriority());
 
   base::DictionaryValue correct_action;
   correct_action.SetString(keys::kInstanceTypeKey, keys::kIgnoreRulesType);
   correct_action.SetInteger(keys::kLowerPriorityThanKey, 10);
   base::DictionaryValue incorrect_action;
   incorrect_action.SetString(keys::kInstanceTypeKey, kUnknownActionType);
 
   // Test success.
   input.push_back(linked_ptr<base::Value>(correct_action.DeepCopy()));
   error.clear();
-  result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestActionSet::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_TRUE(error.empty()) << error;
   EXPECT_FALSE(bad_message);
   ASSERT_TRUE(result.get());
   ASSERT_EQ(1u, result->actions().size());
   EXPECT_EQ(WebRequestAction::ACTION_IGNORE_RULES,
             result->actions()[0]->type());
   EXPECT_EQ(10, result->GetMinimumPriority());
 
   // Test failure.
   input.push_back(linked_ptr<base::Value>(incorrect_action.DeepCopy()));
   error.clear();
-  result = WebRequestActionSet::Create(NULL, NULL, input, &error, &bad_message);
+  result = WebRequestActionSet::Create(
+      NULL, HostID(), NULL, input, &error, &bad_message);
   EXPECT_NE("", error);
   EXPECT_FALSE(result.get());
 }
 
 // Test capture group syntax conversions of WebRequestRedirectByRegExAction
 TEST(WebRequestActionTest, PerlToRe2Style) {
 #define CallPerlToRe2Style WebRequestRedirectByRegExAction::PerlToRe2Style
   // foo$1bar -> foo\1bar
   EXPECT_EQ("foo\\1bar", CallPerlToRe2Style("foo$1bar"));
   // foo\$1bar -> foo$1bar
@@ skipping 316 matching lines @@
   for (WebRequestActionSet::Actions::const_iterator it =
            action_set->actions().begin();
        it != action_set->actions().end();
        ++it) {
     EXPECT_EQ(kExpectedNames[index], (*it)->GetName());
     ++index;
   }
 }
 
 }  // namespace extensions