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

Side by Side Diff: chrome/browser/extensions/api/proxy/proxy_apitest.cc

Issue 9690006: Move Proxy Settings API from chrome/browser/extensions to chrome/browser/eextensions/api/proxy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/prefs/pref_service.h" 6 #include "chrome/browser/prefs/pref_service.h"
7 #include "chrome/browser/prefs/proxy_config_dictionary.h" 7 #include "chrome/browser/prefs/proxy_config_dictionary.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/extensions/extension.h" 11 #include "chrome/common/extensions/extension.h"
12 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 13
14 namespace extensions {
15
14 namespace { 16 namespace {
15 17
16 const char kNoServer[] = ""; 18 const char kNoServer[] = "";
17 const char kNoBypass[] = ""; 19 const char kNoBypass[] = "";
18 const char kNoPac[] = ""; 20 const char kNoPac[] = "";
19 21
20 } // namespace 22 } // namespace
21 23
22 class ProxySettingsApiTest : public ExtensionApiTest { 24 class ProxySettingsApiTest : public ExtensionApiTest {
23 protected: 25 protected:
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 ASSERT_TRUE(StartTestServer()); 273 ASSERT_TRUE(StartTestServer());
272 ASSERT_TRUE( 274 ASSERT_TRUE(
273 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; 275 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;
274 } 276 }
275 277
276 // Tests error events: PAC script parse error. 278 // Tests error events: PAC script parse error.
277 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { 279 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) {
278 ASSERT_TRUE( 280 ASSERT_TRUE(
279 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; 281 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_;
280 } 282 }
283
284 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698