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

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

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 5 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
OLDNEW
1 // Copyright (c) 2012 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 "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_util.h" 7 #include "chrome/browser/extensions/extension_util.h"
8 #include "chrome/browser/prefs/proxy_config_dictionary.h"
9 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
11 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 #include "components/proxy_config/proxy_config_dictionary.h"
13 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
14 #include "extensions/test/result_catcher.h" 14 #include "extensions/test/result_catcher.h"
15 15
16 namespace extensions { 16 namespace extensions {
17 17
18 namespace { 18 namespace {
19 19
20 const char kNoServer[] = ""; 20 const char kNoServer[] = "";
21 const char kNoBypass[] = ""; 21 const char kNoBypass[] = "";
22 const char kNoPac[] = ""; 22 const char kNoPac[] = "";
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; 323 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;
324 } 324 }
325 325
326 // Tests error events: PAC script parse error. 326 // Tests error events: PAC script parse error.
327 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { 327 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) {
328 ASSERT_TRUE( 328 ASSERT_TRUE(
329 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; 329 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_;
330 } 330 }
331 331
332 } // namespace extensions 332 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698