| 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/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/base/testing_pref_service.h" | 11 #include "chrome/test/base/testing_pref_service.h" |
| 12 #include "content/test/test_browser_thread.h" | 12 #include "content/test/test_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 content::BrowserThread; |
| 18 using net::SSLConfig; | 19 using net::SSLConfig; |
| 19 using net::SSLConfigService; | 20 using net::SSLConfigService; |
| 20 | 21 |
| 21 class SSLConfigServiceManagerPrefTest : public testing::Test { | 22 class SSLConfigServiceManagerPrefTest : public testing::Test { |
| 22 public: | 23 public: |
| 23 SSLConfigServiceManagerPrefTest() {} | 24 SSLConfigServiceManagerPrefTest() {} |
| 24 | 25 |
| 25 virtual void SetUp() { | 26 virtual void SetUp() { |
| 26 message_loop_.reset(new MessageLoop()); | 27 message_loop_.reset(new MessageLoop()); |
| 27 ui_thread_.reset( | 28 ui_thread_.reset( |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 message_loop_->RunAllPending(); | 104 message_loop_->RunAllPending(); |
| 104 | 105 |
| 105 SSLConfig config; | 106 SSLConfig config; |
| 106 config_service->GetSSLConfig(&config); | 107 config_service->GetSSLConfig(&config); |
| 107 | 108 |
| 108 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites); | 109 EXPECT_NE(old_config.disabled_cipher_suites, config.disabled_cipher_suites); |
| 109 ASSERT_EQ(2u, config.disabled_cipher_suites.size()); | 110 ASSERT_EQ(2u, config.disabled_cipher_suites.size()); |
| 110 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]); | 111 EXPECT_EQ(0x0004, config.disabled_cipher_suites[0]); |
| 111 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]); | 112 EXPECT_EQ(0x0005, config.disabled_cipher_suites[1]); |
| 112 } | 113 } |
| OLD | NEW |