diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 19:47:31 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 19:47:31 +0000 |
| commit | dfd6ee455e4c99ca032d2a9fbb9ad668c82d2587 (patch) | |
| tree | 822f60448c553a00ad0100e69b9d157b292d6c3d | |
| parent | b0ab1d465fb0dc6d8592bd8a8f16f1c0e9cbc7aa (diff) | |
| download | chromium_src-dfd6ee455e4c99ca032d2a9fbb9ad668c82d2587.zip chromium_src-dfd6ee455e4c99ca032d2a9fbb9ad668c82d2587.tar.gz chromium_src-dfd6ee455e4c99ca032d2a9fbb9ad668c82d2587.tar.bz2 | |
Update some windows-only browser tests to run on all platforms.
TEST=Ran affected browser tests.
BUG=None
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=39642
Review URL: http://codereview.chromium.org/618010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39911 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_devtools_browsertests.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_startup_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 21 | ||||
| -rwxr-xr-x | chrome/chrome_tests.gypi | 10 |
4 files changed, 25 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index e723b4d..6422f5f 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -16,8 +16,6 @@ #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 ad043df..6894b87 100644 --- a/chrome/browser/extensions/extension_startup_unittest.cc +++ b/chrome/browser/extensions/extension_startup_unittest.cc @@ -160,12 +160,10 @@ 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 427f6cf..7ab30b4 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -4,7 +4,26 @@ #include "chrome/browser/extensions/extension_apitest.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { +#include "chrome/browser/browser.h" +#include "chrome/browser/pref_service.h" +#include "chrome/browser/profile.h" +#include "chrome/common/pref_names.h" + +// TODO(skerner): This test is flaky in chromeos. Figure out why and fix. +#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) +#define MAYBE_Tabs DISABLED_Tabs +#else +#define MAYBE_Tabs Tabs +#endif + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_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_; } diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 756bd9c..88cb3cb 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -10,13 +10,8 @@ 'browser/views/find_bar_host_browsertest.cc', ], 'browser_tests_sources_win_specific': [ - 'browser/extensions/extension_devtools_browsertest.cc', - 'browser/extensions/extension_devtools_browsertest.h', - 'browser/extensions/extension_devtools_browsertests.cc', 'browser/extensions/extension_shelf_model_unittest.cc', - 'browser/extensions/extension_startup_unittest.cc', 'browser/extensions/extension_storage_apitest.cc', - 'browser/extensions/extension_tabs_apitest.cc', 'browser/extensions/extension_popup_apitest.cc', # TODO(jam): http://crbug.com/15101 These tests fail on Linux and Mac. 'browser/child_process_security_policy_browser_test.cc', @@ -1147,6 +1142,9 @@ 'browser/extensions/content_script_all_frames_apitest.cc', 'browser/extensions/content_script_extension_process_apitest.cc', 'browser/extensions/cross_origin_xhr_apitest.cc', + 'browser/extensions/extension_devtools_browsertest.cc', + 'browser/extensions/extension_devtools_browsertest.h', + 'browser/extensions/extension_devtools_browsertests.cc', 'browser/extensions/execute_script_apitest.cc', 'browser/extensions/extension_apitest.cc', 'browser/extensions/extension_apitest.h', @@ -1163,6 +1161,8 @@ 'browser/extensions/extension_messages_apitest.cc', 'browser/extensions/extension_override_apitest.cc', 'browser/extensions/extension_processes_apitest.cc', + 'browser/extensions/extension_startup_unittest.cc', + 'browser/extensions/extension_tabs_apitest.cc', 'browser/extensions/extension_toolbar_model_unittest.cc', 'browser/extensions/extension_toolstrip_apitest.cc', 'browser/extensions/incognito_noscript_apitest.cc', |