Allow dynamic updating of authentication policies

net/http/http_auth_handler_negotiate_unittest.cc

Index: net/http/http_auth_handler_negotiate_unittest.cc
diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc
index 49ebdad62adb5173e02d99f1bd679bcb662e4cad..79a60051cc30f019dcf71b7357e8c0d3b9dc08cf 100644
--- a/net/http/http_auth_handler_negotiate_unittest.cc
+++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -45,13 +45,13 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest {
     factory_.reset(new HttpAuthHandlerNegotiate::Factory());
     factory_->set_url_security_manager(url_security_manager_.get());
 #if defined(OS_ANDROID)
-    std::string* authenticator =
-        new std::string("org.chromium.test.DummySpnegoAuthenticator");
-    factory_->set_library(authenticator);
+    scoped_ptr<std::string> authenticator(
+        new std::string("org.chromium.test.DummySpnegoAuthenticator"));
+    factory_->set_library(authenticator.Pass());
     MockAuthLibrary::EnsureTestAccountExists();
 #endif
 #if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
-    factory_->set_library(auth_library_);
+    factory_->set_library(make_scoped_ptr(auth_library_));

[asanka, 2015/10/28 03:27:43]

Preexisting: This is dangerous territory. Can we avoid passing ownership while
keeping a reference?

[aberent, 2015/11/02 18:52:50]

Not without significant refactoring of the tests (probably taking this out of
setup and doing it in the individual tests). This isn't new, the factory
internally always took ownership; it simply didn't declare in its interface that
it was going to (i.e. it took a straight pointer that it then used internally to
update a scoped pointer, see the old comment at line 227). As such I think
fixing this should be a different CL.

 #endif
     factory_->set_host_resolver(resolver_.get());
   }
@@ -224,7 +224,9 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest {
 #if defined(OS_WIN)
   scoped_ptr<SecPkgInfoW> security_package_;
 #endif
-  // |auth_library_| is passed to |factory_|, which assumes ownership of it.
+  // |auth_library_| is passed to |factory_|, which assumes ownership of it, but
+  // can't be a scoped pointer to it since the tests need access when they set
+  // up the mocks after passing ownership.
   MockAuthLibrary* auth_library_;
   scoped_ptr<MockHostResolver> resolver_;
   scoped_ptr<URLSecurityManager> url_security_manager_;
@@ -366,7 +368,7 @@ TEST_F(HttpAuthHandlerNegotiateTest, MissingGSSAPI) {
   negotiate_factory->set_host_resolver(host_resolver.get());
   negotiate_factory->set_url_security_manager(&url_security_manager);
   negotiate_factory->set_library(
-      new GSSAPISharedLibrary("/this/library/does/not/exist"));
+      make_scoped_ptr(new GSSAPISharedLibrary("/this/library/does/not/exist")));
 
   GURL gurl("http://www.example.com");
   scoped_ptr<HttpAuthHandler> generic_handler;