chrome/browser/extensions/api/proxy/proxy_apitest.cc - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « chrome/browser/extensions/api/preference/preference_helpers.cc ('k') | chrome/browser/extensions/api/search_engines_private/search_engines_private_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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"

6 #include "build/build_config.h"	5 #include "build/build_config.h"

7 #include "chrome/browser/extensions/extension_apitest.h"	6 #include "chrome/browser/extensions/extension_apitest.h"

8 #include "chrome/browser/extensions/extension_util.h"	7 #include "chrome/browser/extensions/extension_util.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"

	11 #include "components/prefs/pref_service.h"

12 #include "components/proxy_config/proxy_config_dictionary.h"	12 #include "components/proxy_config/proxy_config_dictionary.h"

13 #include "components/proxy_config/proxy_config_pref_names.h"	13 #include "components/proxy_config/proxy_config_pref_names.h"

14 #include "extensions/common/extension.h"	14 #include "extensions/common/extension.h"

15 #include "extensions/test/result_catcher.h"	15 #include "extensions/test/result_catcher.h"

16	16

17 namespace extensions {	17 namespace extensions {

18	18

19 namespace {	19 namespace {

20	20

21 const char kNoServer[] = "";	21 const char kNoServer[] = "";

(...skipping 303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
325 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;	325 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_;

326 }	326 }

327	327

328 // Tests error events: PAC script parse error.	328 // Tests error events: PAC script parse error.

329 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) {	329 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) {

330 ASSERT_TRUE(	330 ASSERT_TRUE(

331 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_;	331 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_;

332 }	332 }

333	333

334 } // namespace extensions	334 } // namespace extensions

OLD	NEW