Revert 50296 (Causes DCHECK failures) - Make CookieMonster NonThreadSafe....

chrome/browser/extensions/extension_function.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_
 
 #include <string>
 #include <list>
 
@@ skipping 17 matching lines @@
     error_ = error; \
     bad_message_ = true; \
     return false; \
   } while (0)
 
 #define DECLARE_EXTENSION_FUNCTION_NAME(name) \
   public: static const char* function_name() { return name; }
 
 // Abstract base class for extension functions the ExtensionFunctionDispatcher
 // knows how to dispatch to.
-class ExtensionFunction : public base::RefCountedThreadSafe<ExtensionFunction> {
+//
+// TODO(aa): This will have to become reference counted when we introduce
+// APIs that live beyond a single stack frame.
+class ExtensionFunction : public base::RefCounted<ExtensionFunction> {
  public:
   ExtensionFunction() : request_id_(-1), name_(""), has_callback_(false) {}
 
   // Specifies the name of the function.
   void set_name(const std::string& name) { name_ = name; }
   const std::string name() const { return name_; }
 
   // Set the profile which contains the extension that has originated this
   // function call.
   void set_profile(Profile* profile) { profile_ = profile; }
@@ skipping 39 matching lines @@
   void set_include_incognito(bool include) { include_incognito_ = include; }
   bool include_incognito() { return include_incognito_; }
 
   // Execute the API. Clients should call set_raw_args() and
   // set_request_id() before calling this method. Derived classes should be
   // ready to return raw_result() and error() before returning from this
   // function.
   virtual void Run() = 0;
 
  protected:
-  friend class base::RefCountedThreadSafe<ExtensionFunction>;
+  friend class base::RefCounted<ExtensionFunction>;
 
   virtual ~ExtensionFunction() {}
 
   // Gets the extension that called this function. This can return NULL for
   // async functions, for example if the extension is unloaded while the
   // function is running.
   Extension* GetExtension();
 
   // Gets the "current" browser, if any.
   //
@@ skipping 112 matching lines @@
   }
 
  protected:
   virtual ~SyncExtensionFunction() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncExtensionFunction);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_H_