Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 163 matching lines @@
     TestingProfile::Builder builder;
     builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               SigninManagerFake::Build);
     builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(),
                               FakeProfileOAuth2TokenServiceWrapper::Build);
 
     profile_ = builder.Build().Pass();
     url_factory_.set_remove_fetcher_on_delete(true);
 
+    // Make sure the UserPolicySigninService has been created for this Profile.
+    UserPolicySigninServiceFactory::GetInstance()->RemoveTestingFactory(

[Andrew T Wilson (Slow), 2014/03/10 12:30:45]

Having RemoveTestingFactory() override ServiceIsNULLForTests() seems like a
really weird side-effect.

+        profile_.get());
+    ASSERT_TRUE(UserPolicySigninServiceFactory::GetForProfile(profile_.get()));
+
     signin_manager_ = static_cast<SigninManagerFake*>(
         SigninManagerFactory::GetForProfile(profile_.get()));
     // Tests are responsible for freeing the UserCloudPolicyManager instances
     // they inject.
     manager_.reset(UserCloudPolicyManagerFactory::GetForBrowserContext(
         profile_.get()));
     manager_->Init(&schema_registry_);
     mock_store_ = static_cast<MockUserCloudPolicyStore*>(
         manager_->core()->store());
     DCHECK(mock_store_);
@@ skipping 611 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy