Implement chromium.self in content scripts, fix bugs

chrome/common/extensions/user_script.cc

Index: chrome/common/extensions/user_script.cc
diff --git a/chrome/common/extensions/user_script.cc b/chrome/common/extensions/user_script.cc
index 69fe5f4f515d214b6a7247d0585cac72c733cb76..abe92807fc5b3d2417646253a6c772831e423514 100644
--- a/chrome/common/extensions/user_script.cc
+++ b/chrome/common/extensions/user_script.cc
@@ -40,6 +40,9 @@ void UserScript::Pickle(::Pickle* pickle) const {
   // Write the run location.
   pickle->WriteInt(run_location());
 
+  // Write the extension id.
+  pickle->WriteString(extension_id());
+
   // Write globs.
   pickle->WriteSize(globs_.size());
   for (std::vector<std::string>::const_iterator glob = globs_.begin();
@@ -76,6 +79,9 @@ void UserScript::Unpickle(const ::Pickle& pickle, void** iter) {
   CHECK(run_location >= 0 && run_location < RUN_LOCATION_LAST);
   run_location_ = static_cast<RunLocation>(run_location);
 
+  // Read the extension ID.
+  CHECK(pickle.ReadString(iter, &extension_id_));
+
   // Read globs.
   size_t num_globs = 0;
   CHECK(pickle.ReadSize(iter, &num_globs));