diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 23:16:30 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-22 23:16:30 +0000 |
| commit | 91aecd4f50ae915ea4bb21b650d05304309ce977 (patch) | |
| tree | 2a4ec9363727db736ba718d331354af3f240af2b /chrome/browser | |
| parent | 9362cdc48197b924615b131603b3c5e92493f233 (diff) | |
| download | chromium_src-91aecd4f50ae915ea4bb21b650d05304309ce977.zip chromium_src-91aecd4f50ae915ea4bb21b650d05304309ce977.tar.gz chromium_src-91aecd4f50ae915ea4bb21b650d05304309ce977.tar.bz2 | |
Revert 39642 - Update some windowsonly browser tests to run on all platforms.
TEST=Ran affected browser tests.
BUG=None
Review URL: http://codereview.chromium.org/618010
TBR=skerner@chromium.org
Review URL: http://codereview.chromium.org/652084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
3 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 6422f5f..e723b4d 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -16,6 +16,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/views/extensions/extension_shelf.h" +#include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/extensions/extension_error_reporter.h" diff --git a/chrome/browser/extensions/extension_startup_unittest.cc b/chrome/browser/extensions/extension_startup_unittest.cc index 6894b87..ad043df 100644 --- a/chrome/browser/extensions/extension_startup_unittest.cc +++ b/chrome/browser/extensions/extension_startup_unittest.cc @@ -160,10 +160,12 @@ class ExtensionsStartupTest : public ExtensionStartupTestBase { } }; +#if defined(OS_WIN) IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, Test) { WaitForServicesToStart(3, true); TestInjection(true, true); } +#endif // defined(OS_WIN) // ExtensionsLoadTest // Ensures that we can startup the browser with --load-extension and see them diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index d26c9ab..427f6cf 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -4,19 +4,7 @@ #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/browser.h" -#include "chrome/browser/pref_service.h" -#include "chrome/browser/profile.h" -#include "chrome/common/pref_names.h" - IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { StartHTTPServer(); - - // The test creates a tab and checks that the URL of the new tab - // is that of the new tab page. Make sure the pref that controls - // this is set. - browser()->profile()->GetPrefs()->SetBoolean( - prefs::kHomePageIsNewTabPage, true); - ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_; } |