Index: chrome/browser/io_thread_unittest.cc |
diff --git a/chrome/browser/io_thread_unittest.cc b/chrome/browser/io_thread_unittest.cc |
index a8e656f74fcaf643ee22320a4e63a7029baa4215..2d18aae3e748f35a991894be4f2300eb55c27e16 100644 |
--- a/chrome/browser/io_thread_unittest.cc |
+++ b/chrome/browser/io_thread_unittest.cc |
@@ -4,10 +4,19 @@ |
#include "base/command_line.h" |
#include "base/metrics/field_trial.h" |
+#include "base/prefs/pref_registry_simple.h" |
+#include "base/prefs/pref_service.h" |
+#include "base/prefs/testing_pref_service.h" |
#include "base/test/mock_entropy_provider.h" |
+#include "chrome/browser/extensions/event_router_forwarder.h" |
#include "chrome/browser/io_thread.h" |
#include "chrome/common/chrome_switches.h" |
+#include "chrome/common/pref_names.h" |
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" |
+#include "components/policy/core/common/mock_policy_service.h" |
+#include "components/proxy_config/proxy_config_pref_names.h" |
+#include "content/public/test/test_browser_thread_bundle.h" |
+#include "net/http/http_auth_handler_negotiate.h" |
#include "net/http/http_network_session.h" |
#include "net/http/http_server_properties_impl.h" |
#include "net/quic/quic_protocol.h" |
@@ -17,9 +26,34 @@ |
namespace test { |
using ::testing::ElementsAre; |
+using ::testing::ReturnRef; |
+// Class used for accessing IOThread methods (friend of IOThread). Creating |
+// an IOThreadPeer creates and initializes an IOThread instance set up for |
+// testing, deleting it cleanly closes down and deletes the IOThread instance. |
class IOThreadPeer { |
public: |
+ IOThreadPeer() |
+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
+ pref_service_(new TestingPrefServiceSimple()), |
+ event_router_forwarder_(new extensions::EventRouterForwarder) { |
+ PrefRegistrySimple* pref_registry = pref_service_->registry(); |
+ IOThread::RegisterPrefs(pref_registry); |
+ pref_registry->RegisterDictionaryPref(proxy_config::prefs::kProxy); |
Bernhard Bauer
2015/10/23 08:15:41
Call PrefProxyConfigTrackerImpl::RegisterPrefs()?
aberent
2015/10/23 15:40:33
Done. Thanks, I was looking for something of the s
|
+ SSLConfigServiceManager::RegisterPrefs(pref_registry); |
+ |
+ // Set up default function behaviour. |
+ EXPECT_CALL(policy_service_, |
+ GetPolicies(policy::PolicyNamespace( |
+ policy::POLICY_DOMAIN_CHROME, std::string()))) |
+ .WillRepeatedly(ReturnRef(policy_map_)); |
+ io_thread_.reset(new IOThread(pref_service_.get(), &policy_service_, |
+ nullptr, event_router_forwarder_.get())); |
+ io_thread_->Init(); |
+ } |
+ |
+ ~IOThreadPeer() { io_thread_->CleanUp(); } |
Bernhard Bauer
2015/10/23 08:15:41
Is this clang-formatted? If not, I would move this
aberent
2015/10/23 15:40:33
Yes, this is clang formatted; would not have been
Bernhard Bauer
2015/10/23 15:57:58
Hm. Could we out-of-line this so clang-format will
|
+ |
static void ConfigureQuicGlobals( |
const base::CommandLine& command_line, |
base::StringPiece quic_trial_group, |
@@ -45,6 +79,18 @@ class IOThreadPeer { |
net::HttpNetworkSession::Params* params) { |
IOThread::InitializeNetworkSessionParamsFromGlobals(globals, params); |
} |
+ |
+ IOThread* io_thread() const { return io_thread_.get(); } |
+ |
+ TestingPrefServiceSimple* pref_service() const { return pref_service_.get(); } |
+ |
+ private: |
+ content::TestBrowserThreadBundle thread_bundle_; |
+ scoped_ptr<TestingPrefServiceSimple> pref_service_; |
Bernhard Bauer
2015/10/23 08:15:41
You could probably make this a direct member, so y
aberent
2015/10/23 15:40:33
Done.
|
+ scoped_refptr<extensions::EventRouterForwarder> event_router_forwarder_; |
+ policy::PolicyMap policy_map_; |
+ policy::MockPolicyService policy_service_; |
+ scoped_ptr<IOThread> io_thread_; |
Bernhard Bauer
2015/10/23 08:15:41
DISALLOW_COPY_AND_ASSIGN
aberent
2015/10/23 15:40:33
Done.
|
}; |
class IOThreadTest : public testing::Test { |
@@ -509,4 +555,64 @@ TEST_F(IOThreadTest, QuicDisallowedByPolicy) { |
EXPECT_FALSE(params.enable_quic); |
} |
+TEST_F(IOThreadTest, UpdateNegotiateDisableCnameLookup) { |
+ IOThreadPeer peer; |
+ |
+ net::HttpAuthHandlerRegistryFactory* factory = |
+ peer.io_thread()->globals()->http_auth_handler_factory.get(); |
+ |
+ auto negotiate_factory = static_cast<net::HttpAuthHandlerNegotiate::Factory*>( |
+ factory->GetSchemeFactory("negotiate")); |
+ peer.pref_service()->SetBoolean(prefs::kDisableAuthNegotiateCnameLookup, |
+ false); |
+ EXPECT_FALSE(negotiate_factory->disable_cname_lookup()); |
+ peer.pref_service()->SetBoolean(prefs::kDisableAuthNegotiateCnameLookup, |
+ true); |
+ EXPECT_TRUE(negotiate_factory->disable_cname_lookup()); |
+} |
+ |
+TEST_F(IOThreadTest, UpdateEnableAuthNegotiatePort) { |
+ IOThreadPeer peer; |
+ |
+ net::HttpAuthHandlerRegistryFactory* factory = |
+ peer.io_thread()->globals()->http_auth_handler_factory.get(); |
+ |
+ auto negotiate_factory = static_cast<net::HttpAuthHandlerNegotiate::Factory*>( |
+ factory->GetSchemeFactory("negotiate")); |
+ peer.pref_service()->SetBoolean(prefs::kEnableAuthNegotiatePort, false); |
+ EXPECT_FALSE(negotiate_factory->use_port()); |
+ peer.pref_service()->SetBoolean(prefs::kEnableAuthNegotiatePort, true); |
+ EXPECT_TRUE(negotiate_factory->use_port()); |
+} |
+ |
+TEST_F(IOThreadTest, UpdateServerWhitelist) { |
+ IOThreadPeer peer; |
+ |
+ GURL url("http://test.example.com"); |
+ |
+ peer.pref_service()->SetString(prefs::kAuthServerWhitelist, ""); |
Bernhard Bauer
2015/10/23 08:15:41
Use an empty std::string() constructor to save a c
aberent
2015/10/23 15:40:33
Instruction level performance is hardly and issue
|
+ net::URLSecurityManager* security_manager = |
+ peer.io_thread()->globals()->url_security_manager.get(); |
+ EXPECT_FALSE(security_manager->CanUseDefaultCredentials(url)); |
+ |
+ peer.pref_service()->SetString(prefs::kAuthServerWhitelist, "*"); |
+ security_manager = peer.io_thread()->globals()->url_security_manager.get(); |
+ EXPECT_TRUE(security_manager->CanUseDefaultCredentials(url)); |
+} |
+ |
+TEST_F(IOThreadTest, UpdateDelegateWhitelist) { |
+ IOThreadPeer peer; |
+ |
+ GURL url("http://test.example.com"); |
+ |
+ peer.pref_service()->SetString(prefs::kAuthNegotiateDelegateWhitelist, ""); |
+ net::URLSecurityManager* security_manager = |
+ peer.io_thread()->globals()->url_security_manager.get(); |
+ EXPECT_FALSE(security_manager->CanDelegate(url)); |
+ |
+ peer.pref_service()->SetString(prefs::kAuthNegotiateDelegateWhitelist, "*"); |
+ security_manager = peer.io_thread()->globals()->url_security_manager.get(); |
+ EXPECT_TRUE(security_manager->CanDelegate(url)); |
+} |
+ |
} // namespace test |