Revert 24372 - Delay request loading until all user scripts that request depe...

chrome/browser/extensions/user_script_master.h

Index: chrome/browser/extensions/user_script_master.h
===================================================================
--- chrome/browser/extensions/user_script_master.h	(revision 24418)
+++ chrome/browser/extensions/user_script_master.h	(working copy)
@@ -28,7 +28,7 @@
   // script-reloading worker on as well as the path the scripts live in.
   // These are normally the file thread and a directory inside the profile.
   UserScriptMaster(MessageLoop* worker, const FilePath& script_dir);
-  virtual ~UserScriptMaster();
+  ~UserScriptMaster();
 
   // Add a watched directory. All scripts will be reloaded when any file in
   // this directory changes.
@@ -36,7 +36,7 @@
 
   // Kicks off a process on the file thread to reload scripts from disk
   // into a new chunk of shared memory and notify renderers.
-  virtual void StartScan();
+  void StartScan();
 
   // Gets the segment of shared memory for the scripts.
   base::SharedMemory* GetSharedMemory() const {