chrome/browser/net/ssl_config_service_manager_pref_unittest.cc - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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/net/ssl_config_service_manager_pref_unittest.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, 2 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

« chrome/browser/chromeos/proxy_config_service_impl.h ('K') | « chrome/browser/net/proxy_service_factory.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/test/pyautolib/pyauto.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/net/pref_proxy_config_service.h"	5 #include "chrome/browser/net/ssl_config_service_manager.h"

6	6

7 #include "base/message_loop.h"	7 #include "base/message_loop.h"

8 #include "base/values.h"	8 #include "base/values.h"

9 #include "chrome/browser/net/ssl_config_service_manager.h"

10 #include "chrome/common/pref_names.h"	9 #include "chrome/common/pref_names.h"

11 #include "chrome/test/base/testing_pref_service.h"	10 #include "chrome/test/base/testing_pref_service.h"

12 #include "content/browser/browser_thread.h"	11 #include "content/browser/browser_thread.h"

13 #include "net/base/ssl_config_service.h"	12 #include "net/base/ssl_config_service.h"

14 #include "testing/gtest/include/gtest/gtest.h"	13 #include "testing/gtest/include/gtest/gtest.h"

15	14

16 using base::ListValue;	15 using base::ListValue;

17 using base::Value;	16 using base::Value;

18 using net::SSLConfig;	17 using net::SSLConfig;

19 using net::SSLConfigService;	18 using net::SSLConfigService;

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 message_loop_->RunAllPending();	102 message_loop_->RunAllPending();

104	103

105 SSLConfig config;	104 SSLConfig config;

106 config_service->GetSSLConfig(&config);	105 config_service->GetSSLConfig(&config);

107	106

108 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites);	107 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites);

109 ASSERT_EQ(2u, config.disabled_cipher_suites.size());	108 ASSERT_EQ(2u, config.disabled_cipher_suites.size());

110 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]);	109 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]);

111 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]);	110 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]);

112 }	111 }

OLD	NEW