summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 23:16:30 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 23:16:30 +0000
commit91aecd4f50ae915ea4bb21b650d05304309ce977 (patch)
tree2a4ec9363727db736ba718d331354af3f240af2b
parent9362cdc48197b924615b131603b3c5e92493f233 (diff)
downloadchromium_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
-rw-r--r--chrome/browser/extensions/extension_devtools_browsertests.cc2
-rw-r--r--chrome/browser/extensions/extension_startup_unittest.cc2
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc12
-rwxr-xr-xchrome/chrome_tests.gypi10
4 files changed, 9 insertions, 17 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_;
}
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d4744cf..3708a49 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -10,8 +10,13 @@
'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',
@@ -1135,9 +1140,6 @@
'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',
@@ -1154,8 +1156,6 @@
'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',