Revert "Revert r31175 r31176 r31187"

The bustage seems to be a WebKit change upstream. It is not reverted in
WebKit and merger. So bring the innocent change back in.

TBR=jam
TEST=green tree

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

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

1 files changed, 9 insertions, 1 deletions

diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index 270a690..a8c3fa6 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -29,7 +29,6 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
   // For testability, the constructor takes the path the scripts live in.
   // This is normally a directory inside the profile.
   UserScriptMaster(const FilePath& script_dir);
-  virtual ~UserScriptMaster();
 
   // Add a watched directory. All scripts will be reloaded when any file in
   // this directory changes.
@@ -53,6 +52,11 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
   // Returns the path to the directory user scripts are stored in.
   FilePath user_script_dir() const { return user_script_dir_; }
 
+ protected:
+  friend class base::RefCountedThreadSafe<UserScriptMaster>;
+
+  virtual ~UserScriptMaster();
+
  private:
   FRIEND_TEST(UserScriptMasterTest, Parse1);
   FRIEND_TEST(UserScriptMasterTest, Parse2);
@@ -91,6 +95,10 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
     }
 
    private:
+    friend class base::RefCountedThreadSafe<UserScriptMaster::ScriptReloader>;
+
+    ~ScriptReloader() {}
+
     // Where functions are run:
     //    master          file
     //   StartScan   ->  RunScan