Resubmit: Block content scripts from executing until user grants permission

extensions/common/user_script_unittest.cc

Index: extensions/common/user_script_unittest.cc
diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc
index 90a74ce5073778ad8c34d8ec80df695df7817ffe..589b55506f3e7d01f5442cc831b5e4d6ec90ff5c 100644
--- a/extensions/common/user_script_unittest.cc
+++ b/extensions/common/user_script_unittest.cc
@@ -2,6 +2,7 @@
 // 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"
@@ -189,6 +190,11 @@ TEST(ExtensionUserScriptTest, Pickle) {
   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);
+
   Pickle pickle;
   script1.Pickle(&pickle);
 
@@ -211,6 +217,9 @@ TEST(ExtensionUserScriptTest, Pickle) {
 
   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(kId, script2.id());
 }
 
 TEST(ExtensionUserScriptTest, Defaults) {