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

extensions/common/user_script.h

Index: extensions/common/user_script.h
diff --git a/extensions/common/user_script.h b/extensions/common/user_script.h
index 5a2731536b2237699a1c76f54aa778d2af9643e8..248cd94db091eb2e972d9e7883f1cd594e233022 100644
--- a/extensions/common/user_script.h
+++ b/extensions/common/user_script.h
@@ -10,7 +10,9 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/memory/linked_ptr.h"

[Devlin, 2015/01/20 17:51:06]

prune

[Xi Han, 2015/01/21 21:30:17]

Done.

 #include "base/strings/string_piece.h"
+#include "extensions/common/consumer.h"
 #include "extensions/common/url_pattern.h"
 #include "extensions/common/url_pattern_set.h"
 #include "url/gurl.h"
@@ -194,8 +196,10 @@ 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; }
+  const ConsumerID& consumer_id() const { return consumer_id_; }
+  void set_consumer_id(const ConsumerID& consumer_id) {
+    consumer_id_ = consumer_id;
+  }
 
   int id() const { return user_script_id_; }
   void set_id(int id) { user_script_id_ = id; }
@@ -203,7 +207,9 @@ class UserScript {
   bool is_incognito_enabled() const { return incognito_enabled_; }
   void set_incognito_enabled(bool enabled) { incognito_enabled_ = enabled; }
 
-  bool is_standalone() const { return extension_id_.empty(); }
+  bool is_standalone() const { return GetExtensionID().empty(); }
+
+  const std::string& GetExtensionID() const;

[Devlin, 2015/01/20 17:51:06]

it's safe to have this inlined as
const std::string& extension_id() const { return consumer_id_.host_id(); }

[Xi Han, 2015/01/21 21:30:17]

Yes, I forgot to update this the legacy code, change it back to a regular getter
function.

 
   // Returns true if the script should be applied to the specified URL, false
   // otherwise.
@@ -222,6 +228,7 @@ class UserScript {
   // Pickle helper functions used to pickle the individual types of components.
   void PickleGlobs(::Pickle* pickle,
                    const std::vector<std::string>& globs) const;
+  void PickleConsumerID(::Pickle* pickle, const ConsumerID& consumer_id) const;
   void PickleURLPatternSet(::Pickle* pickle,
                            const URLPatternSet& pattern_list) const;
   void PickleScripts(::Pickle* pickle, const FileList& scripts) const;
@@ -229,6 +236,9 @@ class UserScript {
   // Unpickle helper functions used to unpickle individual types of components.
   void UnpickleGlobs(const ::Pickle& pickle, PickleIterator* iter,
                      std::vector<std::string>* globs);
+  void UnpickleConsumerID(const ::Pickle& pickle,
+                          PickleIterator* iter,
+                          ConsumerID* consumer_id);
   void UnpickleURLPatternSet(const ::Pickle& pickle, PickleIterator* iter,
                              URLPatternSet* pattern_list);
   void UnpickleScripts(const ::Pickle& pickle, PickleIterator* iter,
@@ -267,9 +277,9 @@ 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_;
+  // The ID of the consumer this script is a part of. The host_id of the
+  // consumer_id can be empty if the script is a "standlone" user script.
+  ConsumerID consumer_id_;
 
   // The globally-unique id associated with this user script. Defaults to
   // -1 for invalid.