diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 17:52:43 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 17:52:43 +0000 |
| commit | e9960c85761f024674bda4624fe3089137dcfa23 (patch) | |
| tree | 56decca2b8bd478b2c0966061a1ad539b1431267 /chrome/browser/extensions/extension_toolbar_model_browsertest.cc | |
| parent | 4c46d7a5b0af9b7d320e709291b270ab7cf07e83 (diff) | |
| download | chromium_src-e9960c85761f024674bda4624fe3089137dcfa23.zip chromium_src-e9960c85761f024674bda4624fe3089137dcfa23.tar.gz chromium_src-e9960c85761f024674bda4624fe3089137dcfa23.tar.bz2 | |
Revert 135164 - Cleanup of browser_test harness.
-share the browser startup code with chrome. Apart from the benefit of making browser_tests more like Chrome, this allows us to write browser_tests that test app mode etc.
-get rid of InProcessBrowserTest::set_initial_window_required now that the above is done
-get rid of InProcessBrowserTest::set_show_window which didn't do anything
-get rid of --disable-tab-closeable-state-watcher which was set by a chromeos test but not used anywhere
I had to create the Mac autorelease pool object a little earlier, since it must be created before the first Browser window is created (which used to happen in InProcessBrowserTest::RunTestOnMainThreadLoop but now happens in BrowserTestBase::SetUp()).
Review URL: https://chromiumcodereview.appspot.com/10278003
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10352015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_toolbar_model_browsertest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc index bf74f3c..2e53f92 100644 --- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc +++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc @@ -25,10 +25,12 @@ class ExtensionToolbarModelTest : public ExtensionBrowserTest, ExtensionBrowserTest::SetUp(); } - virtual void SetUpOnMainThread() OVERRIDE { - ExtensionService* service = browser()->profile()->GetExtensionService(); + virtual Browser* CreateBrowser(Profile* profile) { + Browser* b = InProcessBrowserTest::CreateBrowser(profile); + ExtensionService* service = b->profile()->GetExtensionService(); model_ = service->toolbar_model(); model_->AddObserver(this); + return b; } virtual void CleanUpOnMainThread() { |