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

Side by Side Diff: chrome/browser/net/ssl_config_service_manager_pref_unittest.cc

Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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) 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/pref_proxy_config_service.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" 9 #include "chrome/browser/net/ssl_config_service_manager.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/testing_pref_service.h" 11 #include "chrome/test/base/testing_pref_service.h"
12 #include "content/browser/browser_thread.h" 12 #include "content/browser/browser_thread.h"
13 #include "net/base/ssl_config_service.h" 13 #include "net/base/ssl_config_service.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 using base::ListValue; 16 using base::ListValue;
17 using base::Value; 17 using base::Value;
18 using net::SSLConfig; 18 using net::SSLConfig;
19 using net::SSLConfigService; 19 using net::SSLConfigService;
20 20
21 class SSLConfigServiceManagerPrefTest : public testing::Test { 21 class SSLConfigServiceManagerPrefTest : public testing::Test {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 message_loop_->RunAllPending(); 103 message_loop_->RunAllPending();
104 104
105 SSLConfig config; 105 SSLConfig config;
106 config_service->GetSSLConfig(&config); 106 config_service->GetSSLConfig(&config);
107 107
108 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites); 108 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites);
109 ASSERT_EQ(2u, config.disabled_cipher_suites.size()); 109 ASSERT_EQ(2u, config.disabled_cipher_suites.size());
110 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]); 110 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]);
111 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]); 111 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]);
112 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698