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

chrome/browser/extensions/extension_function_dispatcher.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
@@ skipping 380 matching lines @@
   return FactoryRegistry::GetInstance()->OverrideFunction(name, factory);
 }
 
 void ExtensionFunctionDispatcher::ResetFunctions() {
   FactoryRegistry::GetInstance()->ResetFunctions();
 }
 
 ExtensionFunctionDispatcher::ExtensionFunctionDispatcher(Profile* profile,
                                                          Delegate* delegate)
   : profile_(profile),
-    delegate_(delegate),
-    ALLOW_THIS_IN_INITIALIZER_LIST(peer_(new Peer(this))) {
+    delegate_(delegate) {
 }
 
 ExtensionFunctionDispatcher::~ExtensionFunctionDispatcher() {
-  peer_->dispatcher_ = NULL;
 }
 
 Browser* ExtensionFunctionDispatcher::GetCurrentBrowser(
     RenderViewHost* render_view_host, bool include_incognito) {
   Browser* browser = delegate_->GetBrowser();
 
   // If the delegate has an associated browser, that is always the right answer.
   if (browser)
     return browser;
 
@@ skipping 58 matching lines @@
   if (!extension->HasApiPermission(params.name)) {
     LOG(ERROR) << "Extension " << extension->id() << " does not have "
                << "permission to function: " << params.name;
     SendAccessDenied(render_view_host, params.request_id);
     return;
   }
 
   scoped_refptr<ExtensionFunction> function(
       FactoryRegistry::GetInstance()->NewFunction(params.name));
   function->SetRenderViewHost(render_view_host);
-  function->set_dispatcher_peer(peer_);
+  function->set_dispatcher(AsWeakPtr());
   function->set_profile(profile_);
   function->set_extension_id(extension->id());
   function->SetArgs(&params.arguments);
   function->set_source_url(params.source_url);
   function->set_request_id(params.request_id);
   function->set_has_callback(params.has_callback);
   function->set_user_gesture(params.user_gesture);
   function->set_include_incognito(service->CanCrossIncognito(extension));
 
   ExtensionsQuotaService* quota = service->quota_service();
   if (quota->Assess(extension->id(), function, &params.arguments,
                     base::TimeTicks::Now())) {
     // See crbug.com/39178.
     ExternalProtocolHandler::PermitLaunchUrl();
 
     function->Run();
   } else {
     render_view_host->Send(new ExtensionMsg_Response(
         render_view_host->routing_id(), function->request_id(), false,
         std::string(), QuotaLimitHeuristic::kGenericOverQuotaError));
   }
 }
 
 void ExtensionFunctionDispatcher::SendAccessDenied(
     RenderViewHost* render_view_host, int request_id) {
   render_view_host->Send(new ExtensionMsg_Response(
       render_view_host->routing_id(), request_id, false, std::string(),
       "Access to extension API denied."));
 }