Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1977)

Unified Diff: chrome/browser/extensions/extension_proxy_apitest.cc

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_proxy_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_proxy_apitest.cc (revision 108608)
+++ chrome/browser/extensions/extension_proxy_apitest.cc (working copy)
@@ -255,8 +255,19 @@
pref_service);
}
+// This test sets proxy to an inavalid host "does.not.exist" and then fetches
+// a page from localhost, expecting an error since host is invalid.
+// On ChromeOS, localhost is by default bypassed, so the page from localhost
+// will be fetched successfully, resulting in no error. Hence this test
+// shouldn't run on ChromeOS.
+#if defined(OS_CHROMEOS)
+#define MAYBE_ProxyEventsInvalidProxy DISABLED_ProxyEventsInvalidProxy
+#else
+#define MAYBE_ProxyEventsInvalidProxy ProxyEventsInvalidProxy
+#endif // defined(OS_CHROMEOS)
+
// Tests error events: invalid proxy
-IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsInvalidProxy) {
+IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, MAYBE_ProxyEventsInvalidProxy) {
ASSERT_TRUE(StartTestServer());
ASSERT_TRUE(
RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;

Powered by Google App Engine
This is Rietveld 408576698