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

extensions/common/user_script_unittest.cc

 // Copyright 2013 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 "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/pickle.h"
 #include "extensions/common/user_script.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ skipping 175 matching lines @@
   script1.set_run_location(UserScript::DOCUMENT_START);
 
   script1.add_url_pattern(pattern1);
   script1.add_url_pattern(pattern2);
   script1.add_exclude_url_pattern(exclude1);
   script1.add_exclude_url_pattern(exclude2);
 
   const int64 kId = 12;
   script1.set_id(kId);
   const std::string kExtensionId = "foo";
-  script1.set_extension_id(kExtensionId);
+  ConsumerID id(ConsumerID::EXTENSIONS, kExtensionId, ConsumerID::TAB,
+                ConsumerID::kDefaultInstanceID);
+  script1.set_consumer_id(id);
 
   Pickle pickle;
   script1.Pickle(&pickle);
 
   PickleIterator iter(pickle);
   UserScript script2;
   script2.Unpickle(pickle, &iter);
 
   EXPECT_EQ(1U, script2.js_scripts().size());
   EXPECT_EQ(script1.js_scripts()[0].url(), script2.js_scripts()[0].url());
 
   EXPECT_EQ(2U, script2.css_scripts().size());
   for (size_t i = 0; i < script2.js_scripts().size(); ++i) {
     EXPECT_EQ(script1.css_scripts()[i].url(), script2.css_scripts()[i].url());
   }
 
   ASSERT_EQ(script1.globs().size(), script2.globs().size());
   for (size_t i = 0; i < script1.globs().size(); ++i) {
     EXPECT_EQ(script1.globs()[i], script2.globs()[i]);
   }
 
   ASSERT_EQ(script1.url_patterns(), script2.url_patterns());
   ASSERT_EQ(script1.exclude_url_patterns(), script2.exclude_url_patterns());
 
-  EXPECT_EQ(kExtensionId, script2.extension_id());
+  EXPECT_EQ(kExtensionId, script2.GetExtensionID());
   EXPECT_EQ(kId, script2.id());
 }
 
 TEST(ExtensionUserScriptTest, Defaults) {
   UserScript script;
   ASSERT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }
 
 }  // namespace extensions