summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autofill/autofill_browsertest.cc6
-rw-r--r--chrome/browser/extensions/webstore_startup_installer_browsertest.cc10
-rw-r--r--chrome/browser/extensions/window_open_apitest.cc10
-rw-r--r--chrome/browser/infobars/infobars_browsertest.cc10
-rw-r--r--chrome/browser/media/chrome_media_stream_infobar_browsertest.cc10
-rw-r--r--chrome/browser/notifications/message_center_notifications_browsertest.cc22
-rw-r--r--chrome/browser/policy/policy_browsertest.cc22
-rw-r--r--chrome/browser/prefs/pref_service_browsertest.cc22
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc10
-rw-r--r--chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc10
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc34
11 files changed, 166 insertions, 0 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index e03bbc1..1b37b32 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -1202,6 +1202,12 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) {
// http://www.merriampark.com/anatomycc.htm
IN_PROC_BROWSER_TEST_F(AutofillTest,
WhitespacesAndSeparatorCharsStrippedForValidCCNums) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/179830).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
ASSERT_TRUE(test_server()->Start());
SubmitCreditCard("Bob Smith", "4408 0412 3456 7893", "12", "2014");
SubmitCreditCard("Jane Doe", "4417-1234-5678-9113", "10", "2013");
diff --git a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
index 6b727f4..1ff011b 100644
--- a/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
+++ b/chrome/browser/extensions/webstore_startup_installer_browsertest.cc
@@ -33,6 +33,10 @@
#include "net/dns/mock_host_resolver.h"
#include "url/gurl.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
using content::WebContents;
using extensions::DictionaryBuilder;
using extensions::Extension;
@@ -236,6 +240,12 @@ IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest, InstallFromHostedApp) {
IN_PROC_BROWSER_TEST_F(WebstoreStartupInstallerTest,
InstallProhibitedForManagedUsers) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc
index 840ff58..1563afb 100644
--- a/chrome/browser/extensions/window_open_apitest.cc
+++ b/chrome/browser/extensions/window_open_apitest.cc
@@ -29,6 +29,10 @@
#include "chrome/browser/extensions/shell_window_registry.h"
#endif
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
#if defined(USE_ASH) && !defined(OS_WIN)
// TODO(stevenjb): Figure out the correct behavior for Ash + Win
#define USE_ASH_PANELS
@@ -254,6 +258,12 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, MAYBE_WindowOpenPanelDetached) {
IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest,
CloseNonExtensionPanelsOnUninstall) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
#if defined(USE_ASH_PANELS)
// On Ash, new panel windows open as popup windows instead.
int num_popups, num_panels;
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index f95fa56..8286b79 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -19,6 +19,10 @@
#include "content/public/browser/notification_service.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
class InfoBarsTest : public InProcessBrowserTest {
public:
InfoBarsTest() {}
@@ -51,6 +55,12 @@ class InfoBarsTest : public InProcessBrowserTest {
};
IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ui_test_utils::NavigateToURL(
diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
index 24410c2..5396b11 100644
--- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
+++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc
@@ -26,6 +26,10 @@
#include "content/public/test/browser_test_utils.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
static const char kMainWebrtcTestHtmlPage[] =
"files/webrtc/webrtc_jsep01_test.html";
static const char kFailedWithErrorPermissionDenied[] =
@@ -202,6 +206,12 @@ IN_PROC_BROWSER_TEST_F(MediaStreamInfobarTest, TestDismissingInfobar) {
IN_PROC_BROWSER_TEST_F(MediaStreamInfobarTest,
TestAcceptThenDenyWhichShouldBeSticky) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
content::WebContents* tab_contents = LoadTestPageInTab();
TestAcceptOnInfobar(tab_contents);
diff --git a/chrome/browser/notifications/message_center_notifications_browsertest.cc b/chrome/browser/notifications/message_center_notifications_browsertest.cc
index bb1d42c..455f514 100644
--- a/chrome/browser/notifications/message_center_notifications_browsertest.cc
+++ b/chrome/browser/notifications/message_center_notifications_browsertest.cc
@@ -21,6 +21,10 @@
#include "ui/message_center/message_center_switches.h"
#include "ui/message_center/message_center_util.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
class TestAddObserver : public message_center::MessageCenterObserver {
public:
TestAddObserver(const std::string& id,
@@ -177,6 +181,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicAddCancel) {
#endif
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicDelegate) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
TestDelegate* delegate;
manager()->Add(CreateTestNotification("hey", &delegate), profile());
@@ -197,6 +207,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest, MAYBE_BasicDelegate) {
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest,
MAYBE_ButtonClickedDelegate) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
TestDelegate* delegate;
manager()->Add(CreateTestNotification("n", &delegate), profile());
@@ -215,6 +231,12 @@ IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest,
IN_PROC_BROWSER_TEST_F(MessageCenterNotificationsTest,
MAYBE_UpdateExistingNotification) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
TestDelegate* delegate;
manager()->Add(CreateTestNotification("n", &delegate), profile());
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index af7564f..869c9bf 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -131,6 +131,10 @@
#include "chromeos/audio/audio_pref_handler.h"
#endif
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
using content::BrowserThread;
using content::URLRequestMockHTTPJob;
using testing::AnyNumber;
@@ -656,6 +660,12 @@ IN_PROC_BROWSER_TEST_F(LocalePolicyTest, ApplicationLocaleValue) {
#endif
IN_PROC_BROWSER_TEST_F(PolicyTest, BookmarkBarEnabled) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// Verifies that the bookmarks bar can be forced to always or never show up.
// Test starts in about:blank.
@@ -1189,6 +1199,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, DeveloperToolsDisabled) {
}
IN_PROC_BROWSER_TEST_F(PolicyTest, WebStoreIconHidden) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// Verifies that the web store icons can be hidden from the new tab page.
// Open new tab page and look for the web store icons.
@@ -1472,6 +1488,12 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, ExtensionInstallSources) {
}
IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// Verifies that the homepage can be configured with policies.
// Set a default, and check that the home button navigates there.
browser()->profile()->GetPrefs()->SetString(
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index fc1ba42..c3c0856 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -23,6 +23,10 @@
#include "chrome/test/base/ui_test_utils.h"
#include "ui/gfx/rect.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
// On GTK, resizing happens asynchronously and we currently don't have a way to
// get called back (it's probably possible, but we don't have that code). Since
// the GTK code is going away, not spending more time on this.
@@ -42,6 +46,12 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
#define MAYBE_Test Test
#endif
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
gfx::Rect bounds = browser()->window()->GetBounds();
gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500));
ASSERT_EQ(expected_bounds.ToString(), bounds.ToString());
@@ -112,6 +122,12 @@ class PreservedWindowPlacementIsLoaded : public PreferenceServiceTest {
};
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsLoaded, Test) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// The window should open with the new reference profile, with window
// placement values stored in the user data directory.
JSONFileValueSerializer deserializer(tmp_pref_file_);
@@ -165,6 +181,12 @@ class PreservedWindowPlacementIsMigrated : public PreferenceServiceTest {
};
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacementIsMigrated, Test) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// The window should open with the old reference profile, with window
// placement values stored in Local State.
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 0ded257..41c3423 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -64,6 +64,10 @@
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
using content::BrowserThread;
using content::DevToolsAgentHost;
using content::DevToolsClientHost;
@@ -2695,6 +2699,12 @@ class PrerenderBrowserTestWithNaCl : public PrerenderBrowserTest {
// Check that NaCl plugins work when enabled, with prerendering.
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithNaCl,
PrerenderNaClPluginEnabled) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
PrerenderTestURL("files/prerender/prerender_plugin_nacl_enabled.html",
FINAL_STATUS_USED,
1);
diff --git a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
index 6433df6..eb238e5 100644
--- a/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
+++ b/chrome/browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc
@@ -14,6 +14,10 @@
#include "content/public/browser/notification_service.h"
#include "content/public/common/result_codes.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
// These tests don't apply to the Mac version; see GetCommandLineForRelaunch
// for details.
#if defined(OS_MACOSX)
@@ -28,6 +32,12 @@ class CloudPrintPolicyTest : public InProcessBrowserTest {
};
IN_PROC_BROWSER_TEST_F(CloudPrintPolicyTest, NormalPassedFlag) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
base::FilePath test_file_path = ui_test_utils::GetTestFilePath(
base::FilePath(), base::FilePath().AppendASCII("empty.html"));
CommandLine new_command_line(GetCommandLineForRelaunch());
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
index 70683c5..485046f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -35,6 +35,10 @@
#include "content/public/test/test_browser_thread.h"
#include "content/public/test/test_utils.h"
+#if defined(OS_WIN) && defined(USE_ASH)
+#include "base/win/windows_version.h"
+#endif
+
using content::BrowserThread;
using content::InterstitialPage;
using content::NavigationController;
@@ -616,6 +620,12 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
}
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareDontProceed) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
SetupWarningAndNavigate(SB_THREAT_TYPE_URL_MALWARE);
EXPECT_EQ(VISIBLE, GetVisibility("malware-icon"));
@@ -661,6 +671,12 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
MalwareIframeDontProceed) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
SetupMalwareIframeWarningAndNavigate();
EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
@@ -717,6 +733,12 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
// by the corresponding policy. Also verifies that sending the "proceed"
// command anyway doesn't advance to the malware site.
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
// Simulate a policy disabling the "proceed anyway" link.
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSafeBrowsingProceedAnywayDisabled, true);
@@ -744,6 +766,12 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ProceedDisabled) {
// TODO(mattm): Should also verify that no report is sent, but there isn't a
// good way to do that in the current design.
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
browser()->profile()->GetPrefs()->SetBoolean(
prefs::kSafeBrowsingReportingEnabled, true);
@@ -771,6 +799,12 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) {
}
IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) {
+#if defined(OS_WIN) && defined(USE_ASH)
+ // Disable this test in Metro+Ash for now (http://crbug.com/262796).
+ if (base::win::GetVersion() >= base::win::VERSION_WIN8)
+ return;
+#endif
+
SetupWarningAndNavigate(SB_THREAT_TYPE_URL_PHISHING);
EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
generated by cgit v1.1 at 2025-02-07 15:33:16 +0000