diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 06:18:32 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 06:18:32 +0000 |
| commit | 9cc688d8459548d09a9efdd9e1e626c40f3b5b34 (patch) | |
| tree | 3b3362efbcbae45fbc6eb064077fa94ae306f47f /chrome/browser | |
| parent | aba3c01242c45d409028457528b75bc03676a3ab (diff) | |
| download | chromium_src-9cc688d8459548d09a9efdd9e1e626c40f3b5b34.zip chromium_src-9cc688d8459548d09a9efdd9e1e626c40f3b5b34.tar.gz chromium_src-9cc688d8459548d09a9efdd9e1e626c40f3b5b34.tar.bz2 | |
Revert "Revert "Revert "Revert "Split ExtensionApiTest.Tabs into several smaller tests and re-enable.""""
This reverts commit cc69af140129a1f2223f640611d0c8b7ae79c4c0.
TBR=aa@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index a81c78b..043e23b 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -9,14 +9,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" -#if defined(OS_WIN) -// This test times out on win. -// http://crbug.com/58269 -#define MAYBE_Tabs DISABLED_Tabs -#else -#define MAYBE_Tabs Tabs -#endif - // Possible race in ChromeURLDataManager. http://crbug.com/59198 #if defined(OS_MACOSX) || defined(OS_LINUX) #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved @@ -24,7 +16,7 @@ #define MAYBE_TabOnRemoved TabOnRemoved #endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) { ASSERT_TRUE(test_server()->Start()); // The test creates a tab and checks that the URL of the new tab @@ -33,7 +25,23 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) { browser()->profile()->GetPrefs()->SetBoolean( prefs::kHomePageIsNewTabPage, true); - ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_; + ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_; +} + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabMove) { + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_; +} + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabEvents) { + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; +} + +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabRelativeURLs) { + ASSERT_TRUE(test_server()->Start()); + ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) + << message_; } IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { |