Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

chrome/test/base/chrome_render_view_host_test_harness.cc

Index: chrome/test/base/chrome_render_view_host_test_harness.cc
diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc
index bf680115de9659be3c620b3fa9f15d1b7815c612..15678c2dba17bb71d67dd88593ebc1a39c3a021d 100644
--- a/chrome/test/base/chrome_render_view_host_test_harness.cc
+++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
@@ -49,12 +49,6 @@ static BrowserContextKeyedService* BuildSigninManagerFake(
 #endif
 }
 
-void ChromeRenderViewHostTestHarness::SetUp() {
-  RenderViewHostTestHarness::SetUp();
-  SigninManagerFactory::GetInstance()->SetTestingFactory(
-          profile(), BuildSigninManagerFake);
-}
-
 void ChromeRenderViewHostTestHarness::TearDown() {
   RenderViewHostTestHarness::TearDown();
 #if defined(USE_ASH)
@@ -67,5 +61,8 @@ void ChromeRenderViewHostTestHarness::TearDown() {
 
 content::BrowserContext*
 ChromeRenderViewHostTestHarness::CreateBrowserContext() {
-  return new TestingProfile();
+  TestingProfile* profile = new TestingProfile();

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

Use TestingProfile::Builder and set the testing factory in the builder. Then get
rid of all the other changes in this CL.

[blundell, 2014/03/11 12:02:47]

+1, great catch Drew.

On 2014/03/10 12:30:45, Andrew T Wilson wrote:

+  SigninManagerFactory::GetInstance()->SetTestingFactory(
+      profile, BuildSigninManagerFake);
+  return profile;
 }