Remove the refcount from ScriptBadgeController.

chrome/browser/extensions/script_badge_controller.cc

 // Copyright (c) 2012 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/script_badge_controller.h"
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace extensions {
 
-ScriptBadgeController::ScriptBadgeController(TabContents* tab_contents)
-    : content::WebContentsObserver(tab_contents->web_contents()),
-      script_executor_(tab_contents->web_contents()),
+ScriptBadgeController::ScriptBadgeController(TabContents* tab_contents,
+                                             ScriptExecutor* script_executor)
+    : ScriptExecutor::Observer(script_executor),
+      content::WebContentsObserver(tab_contents->web_contents()),
       tab_contents_(tab_contents) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(tab_contents->profile()));
 }
 
 ScriptBadgeController::~ScriptBadgeController() {}
 
 std::vector<ExtensionAction*> ScriptBadgeController::GetCurrentActions() const {
   return current_actions_;
@@ skipping 23 matching lines @@
           tab_contents_->extension_tab_helper()->tab_id());
       return ACTION_NONE;
     case 3:  // right
       return extension->ShowConfigureContextMenus() ?
           ACTION_SHOW_CONTEXT_MENU : ACTION_NONE;
   }
 
   return ACTION_NONE;
 }
 
-void ScriptBadgeController::ExecuteScript(
-    const std::string& extension_id,
-    ScriptExecutor::ScriptType script_type,
-    const std::string& code,
-    ScriptExecutor::FrameScope frame_scope,
-    UserScript::RunLocation run_at,
-    ScriptExecutor::WorldType world_type,
-    const ExecuteScriptCallback& callback) {
-  ExecuteScriptCallback this_callback = base::Bind(
-      &ScriptBadgeController::OnExecuteScriptFinished,
-      this,
-      extension_id,
-      callback);
-
-  script_executor_.ExecuteScript(extension_id,
-                                 script_type,
-                                 code,
-                                 frame_scope,
-                                 run_at,
-                                 world_type,
-                                 this_callback);
-}
-
 void ScriptBadgeController::OnExecuteScriptFinished(
     const std::string& extension_id,
-    const ExecuteScriptCallback& callback,
     bool success,
     int32 page_id,
     const std::string& error) {
   if (success && page_id == GetPageID()) {
     if (InsertExtension(extension_id))
       NotifyChange();
   }
-
-  callback.Run(success, page_id, error);
 }
 
 ExtensionService* ScriptBadgeController::GetExtensionService() {
   return ExtensionSystem::Get(tab_contents_->profile())->extension_service();
 }
 
 int32 ScriptBadgeController::GetPageID() {
   return tab_contents_->web_contents()->GetController().GetActiveEntry()->
       GetPageID();
 }
@@ skipping 85 matching lines @@
       current_actions_.erase(it);
       break;
     }
   }
 
   CHECK_EQ(size_before, current_actions_.size() + 1);
   return true;
 }
 
 }  // namespace extensions