diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:34:50 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:34:50 +0000 |
| commit | 94323102a80f786255342a4e73690b163cbbcb36 (patch) | |
| tree | 343e77052c14fad4315d454ceaa2a41b1843d977 /chrome/browser/extensions/script_bubble_controller_unittest.cc | |
| parent | e2a04d0fd207cce42fcfd40dd87fdf0cd98cddaa (diff) | |
| download | chromium_src-94323102a80f786255342a4e73690b163cbbcb36.zip chromium_src-94323102a80f786255342a4e73690b163cbbcb36.tar.gz chromium_src-94323102a80f786255342a4e73690b163cbbcb36.tar.bz2 | |
Remove TabContents from extension tests.
BUG=107201
TEST=no visible change
Review URL: https://chromiumcodereview.appspot.com/11198015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162533 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/script_bubble_controller_unittest.cc')
| -rw-r--r-- | chrome/browser/extensions/script_bubble_controller_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/extensions/script_bubble_controller_unittest.cc b/chrome/browser/extensions/script_bubble_controller_unittest.cc index f37ece5..89006be 100644 --- a/chrome/browser/extensions/script_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/script_bubble_controller_unittest.cc @@ -15,12 +15,11 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/script_bubble_controller.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" -#include "chrome/browser/ui/tab_contents/test_tab_contents.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_builder.h" #include "chrome/common/extensions/feature_switch.h" #include "chrome/common/extensions/value_builder.h" +#include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" @@ -31,7 +30,7 @@ using content::BrowserThread; namespace extensions { namespace { -class ScriptBubbleControllerTest : public TabContentsTestHarness { +class ScriptBubbleControllerTest : public ChromeRenderViewHostTestHarness { public: ScriptBubbleControllerTest() : ui_thread_(BrowserThread::UI, MessageLoop::current()), @@ -40,12 +39,12 @@ class ScriptBubbleControllerTest : public TabContentsTestHarness { } virtual void SetUp() OVERRIDE { - TabContentsTestHarness::SetUp(); + ChromeRenderViewHostTestHarness::SetUp(); CommandLine command_line(CommandLine::NO_PROGRAM); - extension_service_ = - static_cast<TestExtensionSystem*>( - ExtensionSystem::Get(tab_contents()->profile()))-> - CreateExtensionService( + Profile* profile = + Profile::FromBrowserContext(web_contents()->GetBrowserContext()); + extension_service_ = static_cast<TestExtensionSystem*>( + ExtensionSystem::Get(profile))->CreateExtensionService( &command_line, FilePath(), false); extension_service_->component_loader()->AddScriptBubble(); extension_service_->Init(); |