Index: chrome/browser/net/ssl_config_service_manager_pref_unittest.cc |
diff --git a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc |
index e3afe0c8c8fa5f3d53c6339341a3a17b3fdc0240..042dccd1dba521e8b865a485d4e510a8a112cb3b 100644 |
--- a/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc |
+++ b/chrome/browser/net/ssl_config_service_manager_pref_unittest.cc |
@@ -2,42 +2,37 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
Ryan Sleevi
2015/09/08 21:02:16
Why is this unit test still in //chrome/browser/ne
Abhishek
2015/09/10 13:32:53
I've tried removing the mentioned dependency, but
|
-#include "chrome/browser/net/ssl_config_service_manager.h" |
+#include "components/ssl_config/ssl_config_service_manager.h" |
#include "base/command_line.h" |
#include "base/memory/ref_counted.h" |
#include "base/message_loop/message_loop.h" |
#include "base/prefs/pref_registry_simple.h" |
#include "base/prefs/testing_pref_store.h" |
+#include "base/thread_task_runner_handle.h" |
#include "base/values.h" |
#include "chrome/browser/prefs/pref_service_mock_factory.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/testing_pref_service_syncable.h" |
-#include "chrome/test/base/testing_profile.h" |
#include "components/content_settings/core/browser/host_content_settings_map.h" |
#include "components/content_settings/core/common/content_settings.h" |
-#include "content/public/test/test_browser_thread.h" |
+#include "components/pref_registry/testing_pref_service_syncable.h" |
+#include "components/ssl_config/ssl_config_prefs.h" |
+#include "components/ssl_config/ssl_config_switches.h" |
#include "net/socket/ssl_client_socket.h" |
#include "net/ssl/ssl_config_service.h" |
#include "testing/gtest/include/gtest/gtest.h" |
using base::ListValue; |
using base::Value; |
-using content::BrowserThread; |
using net::SSLConfig; |
using net::SSLConfigService; |
+using ssl_config::SSLConfigServiceManager; |
class SSLConfigServiceManagerPrefTest : public testing::Test { |
public: |
- SSLConfigServiceManagerPrefTest() |
- : ui_thread_(BrowserThread::UI, &message_loop_), |
- io_thread_(BrowserThread::IO, &message_loop_) {} |
+ SSLConfigServiceManagerPrefTest() {} |
protected: |
base::MessageLoop message_loop_; |
- content::TestBrowserThread ui_thread_; |
- content::TestBrowserThread io_thread_; |
}; |
// Test channel id with no user prefs. |
@@ -46,7 +41,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, ChannelIDWithoutUserPrefs) { |
SSLConfigServiceManager::RegisterPrefs(local_state.registry()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(&local_state)); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ &local_state, base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |
@@ -63,7 +59,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, GoodDisabledCipherSuites) { |
SSLConfigServiceManager::RegisterPrefs(local_state.registry()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(&local_state)); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ &local_state, base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |
@@ -75,7 +72,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, GoodDisabledCipherSuites) { |
base::ListValue* list_value = new base::ListValue(); |
list_value->Append(new base::StringValue("0x0004")); |
list_value->Append(new base::StringValue("0x0005")); |
- local_state.SetUserPref(prefs::kCipherSuiteBlacklist, list_value); |
+ local_state.SetUserPref(ssl_config::prefs::kCipherSuiteBlacklist, list_value); |
// Pump the message loop to notify the SSLConfigServiceManagerPref that the |
// preferences changed. |
@@ -98,7 +95,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, BadDisabledCipherSuites) { |
SSLConfigServiceManager::RegisterPrefs(local_state.registry()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(&local_state)); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ &local_state, base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |
@@ -112,7 +110,7 @@ TEST_F(SSLConfigServiceManagerPrefTest, BadDisabledCipherSuites) { |
list_value->Append(new base::StringValue("TLS_NOT_WITH_A_CIPHER_SUITE")); |
list_value->Append(new base::StringValue("0x0005")); |
list_value->Append(new base::StringValue("0xBEEFY")); |
- local_state.SetUserPref(prefs::kCipherSuiteBlacklist, list_value); |
+ local_state.SetUserPref(ssl_config::prefs::kCipherSuiteBlacklist, list_value); |
// Pump the message loop to notify the SSLConfigServiceManagerPref that the |
// preferences changed. |
@@ -140,7 +138,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) { |
SSLConfigServiceManager::RegisterPrefs(registry.get()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(local_state.get())); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ local_state.get(), base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |
@@ -155,15 +154,15 @@ TEST_F(SSLConfigServiceManagerPrefTest, NoCommandLinePrefs) { |
ssl_config.version_max); |
// The settings should not be added to the local_state. |
- EXPECT_FALSE(local_state->HasPrefPath(prefs::kSSLVersionMin)); |
- EXPECT_FALSE(local_state->HasPrefPath(prefs::kSSLVersionMax)); |
+ EXPECT_FALSE(local_state->HasPrefPath(ssl_config::prefs::kSSLVersionMin)); |
+ EXPECT_FALSE(local_state->HasPrefPath(ssl_config::prefs::kSSLVersionMax)); |
// Explicitly double-check the settings are not in the preference store. |
std::string version_min_str; |
std::string version_max_str; |
- EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMin, |
+ EXPECT_FALSE(local_state_store->GetString(ssl_config::prefs::kSSLVersionMin, |
&version_min_str)); |
- EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMax, |
+ EXPECT_FALSE(local_state_store->GetString(ssl_config::prefs::kSSLVersionMax, |
&version_max_str)); |
} |
@@ -185,7 +184,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, CommandLinePrefs) { |
SSLConfigServiceManager::RegisterPrefs(registry.get()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(local_state.get())); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ local_state.get(), base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |
@@ -198,18 +198,18 @@ TEST_F(SSLConfigServiceManagerPrefTest, CommandLinePrefs) { |
// Explicitly double-check the settings are not in the preference store. |
const PrefService::Preference* version_min_pref = |
- local_state->FindPreference(prefs::kSSLVersionMin); |
+ local_state->FindPreference(ssl_config::prefs::kSSLVersionMin); |
EXPECT_FALSE(version_min_pref->IsUserModifiable()); |
const PrefService::Preference* version_max_pref = |
- local_state->FindPreference(prefs::kSSLVersionMax); |
+ local_state->FindPreference(ssl_config::prefs::kSSLVersionMax); |
EXPECT_FALSE(version_max_pref->IsUserModifiable()); |
std::string version_min_str; |
std::string version_max_str; |
- EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMin, |
+ EXPECT_FALSE(local_state_store->GetString(ssl_config::prefs::kSSLVersionMin, |
&version_min_str)); |
- EXPECT_FALSE(local_state_store->GetString(prefs::kSSLVersionMax, |
+ EXPECT_FALSE(local_state_store->GetString(ssl_config::prefs::kSSLVersionMax, |
&version_max_str)); |
} |
@@ -229,7 +229,8 @@ TEST_F(SSLConfigServiceManagerPrefTest, NoSSL3) { |
SSLConfigServiceManager::RegisterPrefs(registry.get()); |
scoped_ptr<SSLConfigServiceManager> config_manager( |
- SSLConfigServiceManager::CreateDefaultManager(local_state.get())); |
+ SSLConfigServiceManager::CreateDefaultManager( |
+ local_state.get(), base::ThreadTaskRunnerHandle::Get())); |
ASSERT_TRUE(config_manager.get()); |
scoped_refptr<SSLConfigService> config_service(config_manager->Get()); |
ASSERT_TRUE(config_service.get()); |