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

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

1 files changed, 6 insertions, 9 deletions

diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index f156180..d546b62 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -74,6 +74,9 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
     static bool ParseMetadataHeader(const StringPiece& script_text,
                                     UserScript* script);
 
+    static void LoadScriptsFromDirectory(const FilePath script_dir,
+                                         UserScriptList* result);
+
     ScriptReloader(UserScriptMaster* master)
          : master_(master), master_message_loop_(MessageLoop::current()) {}
 
@@ -91,8 +94,8 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
     // Where functions are run:
     //    master          file
     //   StartScan   ->  RunScan
-    //                     GetNewScripts()
-    //                     ParseMetadataHeader()
+    //                     LoadScriptsFromDirectory()
+    //                     LoadLoneScripts()
     // NotifyMaster  <-  RunScan
 
     // Runs on the master thread.
@@ -103,13 +106,7 @@ class UserScriptMaster : public base::RefCounted<UserScriptMaster>,
     // Scan the specified directory and lone scripts, calling NotifyMaster when
     // done. The parameters are intentionally passed by value so their lifetimes
     // aren't tied to the caller.
-    void RunScan(const FilePath script_dir, const UserScriptList lone_scripts);
-
-    // Runs on the File thread.
-    // Scan the script directory and lone scripts, returning either a new
-    // SharedMemory or NULL on error.
-    base::SharedMemory* GetNewScripts(const FilePath& script_dir,
-                                      const UserScriptList& lone_scripts);
+    void RunScan(const FilePath script_dir, UserScriptList lone_scripts);
 
     // A pointer back to our master.
     // May be NULL if DisownMaster() is called.