Small cleanup to move ExtensionFunctionDispatcher to use WeakPtr instead of Peer.

chrome/browser/extensions/extension_function_dispatcher.h

 // Copyright (c) 2011 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_DISPATCHER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
-#include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 class Extension;
 class ExtensionFunction;
 class ListValue;
 class Profile;
 class RenderViewHost;
 class TabContents;
 struct ExtensionHostMsg_Request_Params;
 
 // A factory function for creating new ExtensionFunction instances.
 typedef ExtensionFunction* (*ExtensionFunctionFactory)();
 
 // ExtensionFunctionDispatcher receives requests to execute functions from
 // Chrome extensions running in a RenderViewHost and dispatches them to the
 // appropriate handler. It lives entirely on the UI thread.
 //
 // ExtensionFunctionDispatcher should be a member of some class that hosts
 // RenderViewHosts and wants them to be able to display extension content.
 // This class should also implement ExtensionFunctionDispatcher::Delegate.
 //
 // Note that a single ExtensionFunctionDispatcher does *not* correspond to a
 // single RVH, a single extension, or a single URL. This is by design so that
 // we can gracefully handle cases like TabContents, where the RVH, extension,
 // and URL can all change over the lifetime of the tab. Instead, these items
 // are all passed into each request.
-class ExtensionFunctionDispatcher {
+class ExtensionFunctionDispatcher
+    : public base::SupportsWeakPtr<ExtensionFunctionDispatcher> {
  public:
   class Delegate {
    public:
     // Returns the browser that this delegate is associated with, if any.
     // Returns NULL otherwise.
     virtual Browser* GetBrowser() = 0;
 
     // Returns the native view for this extension view, if any. This may be NULL
     // if the view is not visible.
     virtual gfx::NativeView GetNativeViewOfHost() = 0;
 
     // Asks the delegate for any relevant TabContents associated with this
     // context. For example, the TabContents in which an infobar or
     // chrome-extension://<id> URL are being shown. Callers must check for a
     // NULL return value (as in the case of a background page).
     virtual TabContents* GetAssociatedTabContents() const = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
-  // The peer object allows us to notify ExtensionFunctions when we are
-  // destroyed.
-  // TODO: this should use WeakPtr
-  struct Peer : public base::RefCounted<Peer> {
-    explicit Peer(ExtensionFunctionDispatcher* dispatcher)
-        : dispatcher_(dispatcher) {}
-    ExtensionFunctionDispatcher* dispatcher_;
-
-   private:
-    friend class base::RefCounted<Peer>;
-
-    ~Peer() {}
-  };
-
   // Gets a list of all known extension function names.
   static void GetAllFunctionNames(std::vector<std::string>* names);
 
   // Override a previously registered function. Returns true if successful,
   // false if no such function was registered.
   static bool OverrideFunction(const std::string& name,
                                ExtensionFunctionFactory factory);
 
   // Resets all functions to their initial implementation.
   static void ResetFunctions();
@@ skipping 24 matching lines @@
   // The profile that this dispatcher is associated with.
   Profile* profile() { return profile_; }
 
  private:
   // Helper to send an access denied error to the requesting render view.
   void SendAccessDenied(RenderViewHost* render_view_host, int request_id);
 
   Profile* profile_;
 
   Delegate* delegate_;
-
-  scoped_refptr<Peer> peer_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_FUNCTION_DISPATCHER_H_