Revert "Implement chromium.self in content scripts..."

This reverts commit 61ab30f52667e739602ab2af4fd8f2d8a0a2a2f0.

Still seeing memory errors.

Review URL: http://codereview.chromium.org/63056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13243 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 15 deletions

diff --git a/chrome/common/extensions/user_script.cc b/chrome/common/extensions/user_script.cc
index abe9280..69fe5f4 100644
--- a/chrome/common/extensions/user_script.cc
+++ b/chrome/common/extensions/user_script.cc
@@ -40,9 +40,6 @@ 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();
@@ -79,9 +76,6 @@ 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));
diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h
index 070ead3..1a8d6df 100644
--- a/chrome/common/extensions/user_script.h
+++ b/chrome/common/extensions/user_script.h
@@ -111,11 +111,6 @@ class UserScript {
   FileList& css_scripts() { return css_scripts_; }
   const FileList& css_scripts() const { return css_scripts_; }
 
-  const std::string& extension_id() const { return extension_id_; }
-  void set_extension_id(const std::string& id) { extension_id_ = id; }
-
-  bool is_standalone() { return extension_id_.empty(); }
-
   // Returns true if the script should be applied to the specified URL, false
   // otherwise.
   bool MatchesUrl(const GURL& url);
@@ -146,10 +141,6 @@ class UserScript {
 
   // List of css scripts defined in content_scripts
   FileList css_scripts_;
-
-  // The ID of the extension this script is a part of, if any. Can be empty if
-  // the script is a "standlone" user script.
-  std::string extension_id_;
 };
 
 typedef std::vector<UserScript> UserScriptList;