Remove the refcount from ScriptBadgeController.

chrome/browser/extensions/extension_tab_helper.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/extension_tab_helper.h"
 
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/page_action_controller.h"
 #include "chrome/browser/extensions/script_badge_controller.h"
-#include "chrome/browser/extensions/script_executor_impl.h"
+#include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 17 matching lines @@
 #include "content/public/browser/web_contents_view.h"
 #include "ui/gfx/image/image.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::RenderViewHost;
 using content::WebContents;
 using extensions::Extension;
 using extensions::PageActionController;
 using extensions::ScriptBadgeController;
-using extensions::ScriptExecutorImpl;
+using extensions::ScriptExecutor;
 
 namespace {
 
 const char kPermissionError[] = "permission_error";
 
 }  // namespace
 
 ExtensionTabHelper::ExtensionTabHelper(TabContents* tab_contents)
     : content::WebContentsObserver(tab_contents->web_contents()),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(tab_contents->profile(), this)),
       pending_web_app_action_(NONE),
       tab_contents_(tab_contents),
+      script_executor_(new extensions::ScriptExecutor(
+          tab_contents->web_contents())),
       active_tab_permission_manager_(tab_contents) {
   if (extensions::switch_utils::AreScriptBadgesEnabled()) {
-    script_badge_controller_ = new ScriptBadgeController(tab_contents);
+    location_bar_controller_.reset(new ScriptBadgeController(
+        tab_contents, script_executor_.get()));
   } else {
-    script_executor_.reset(
-        new ScriptExecutorImpl(tab_contents->web_contents()));
     location_bar_controller_.reset(new PageActionController(tab_contents));
   }
   registrar_.Add(this,
                  content::NOTIFICATION_LOAD_STOP,
                  content::Source<NavigationController>(
                     &tab_contents->web_contents()->GetController()));
 }
 
 ExtensionTabHelper::~ExtensionTabHelper() {
 }
@@ skipping 60 matching lines @@
     UpdateExtensionAppIcon(extension);
 }
 
 SkBitmap* ExtensionTabHelper::GetExtensionAppIcon() {
   if (extension_app_icon_.empty())
     return NULL;
 
   return &extension_app_icon_;
 }
 
-extensions::ScriptExecutor* ExtensionTabHelper::script_executor() {
-  if (script_badge_controller_.get())
-    return script_badge_controller_.get();
-  return script_executor_.get();
-}
-
-extensions::LocationBarController*
-    ExtensionTabHelper::location_bar_controller() {
-  if (script_badge_controller_.get())
-    return script_badge_controller_.get();
-  return location_bar_controller_.get();
-}
-
 void ExtensionTabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(), tab_id()));
 }
 
 void ExtensionTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
@@ skipping 295 matching lines @@
     // last committed entry is not NULL. Last committed entry could be NULL
     // when an interstitial page is injected (e.g. bad https certificate,
     // malware site etc). When this happens, we abort the shortcut update.
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     if (entry)
       GetApplicationInfo(entry->GetPageID());
     else
       pending_web_app_action_ = NONE;
   }
 }