Revert 137630 - Broke ASAN

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 38 matching lines @@
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 class OneClickSigninHelper;
 #endif
 
 namespace browser_sync {
 class SyncedTabDelegate;
 }
 
 namespace extensions {
+class ActionBoxController;
+class ScriptExecutor;
 class WebNavigationTabObserver;
 }
 
 namespace prerender {
 class PrerenderTabHelper;
 }
 
 namespace printing {
 class PrintViewManager;
 class PrintPreviewMessageHandler;
@@ skipping 56 matching lines @@
   BookmarkTabHelper* bookmark_tab_helper() {
     return bookmark_tab_helper_.get();
   }
 
   ConstrainedWindowTabHelper* constrained_window_tab_helper() {
     return constrained_window_tab_helper_.get();
   }
 
   CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
 
+  extensions::ScriptExecutor* extension_script_executor() {
+    return extension_script_executor_.get();
+  }
+
+  extensions::ActionBoxController* extension_action_box_controller() {
+    return extension_action_box_controller_.get();
+  }
+
   ExtensionTabHelper* extension_tab_helper() {
     return extension_tab_helper_.get();
   }
 
   const ExtensionTabHelper* extension_tab_helper() const {
     return extension_tab_helper_.get();
   }
 
   FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
   FindTabHelper* find_tab_helper() { return find_tab_helper_.get(); }
@@ skipping 76 matching lines @@
   // "Tab Helpers" section in the member functions area, above.)
 
   scoped_ptr<AutocompleteHistoryManager> autocomplete_history_manager_;
   scoped_refptr<AutofillManager> autofill_manager_;
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<AutomationTabHelper> automation_tab_helper_;
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
   scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
   scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
   scoped_ptr<CoreTabHelper> core_tab_helper_;
+  scoped_ptr<extensions::ScriptExecutor> extension_script_executor_;
   scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
+  scoped_ptr<extensions::ActionBoxController> extension_action_box_controller_;
   scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<FindTabHelper> find_tab_helper_;
   scoped_ptr<HistoryTabHelper> history_tab_helper_;
   scoped_ptr<HungPluginTabHelper> hung_plugin_tab_helper_;
   scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,
   // per documentation in password_manager.h.
   scoped_ptr<PasswordManagerDelegate> password_manager_delegate_;
   scoped_ptr<PasswordManager> password_manager_;
@@ skipping 46 matching lines @@
 
   // The supporting objects need to outlive the WebContents dtor (as they may
   // be called upon during its execution). As a result, this must come last
   // in the list.
   scoped_ptr<content::WebContents> web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsWrapper);
 };
 
 #endif  // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_