Use TestingProfile::Builder::AddTestingFactory at ChromeRenderViewHostTestHarness

chrome/test/base/chrome_render_view_host_test_harness.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 "chrome/test/base/chrome_render_view_host_test_harness.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 31 matching lines @@
   SigninManagerBase* signin = new SigninManagerBase();
   signin->Initialize(profile, NULL);
   return signin;
 #else
   FakeSigninManager* manager = new FakeSigninManager(profile);
   manager->Initialize(profile, g_browser_process->local_state());
   return manager;
 #endif
 }
 
-void ChromeRenderViewHostTestHarness::SetUp() {
-  RenderViewHostTestHarness::SetUp();
-  SigninManagerFactory::GetInstance()->SetTestingFactory(
-          profile(), BuildSigninManagerFake);
-}
-
 void ChromeRenderViewHostTestHarness::TearDown() {
   RenderViewHostTestHarness::TearDown();
 #if defined(USE_ASH)
   ash::Shell::DeleteInstance();
 #endif
 #if defined(USE_AURA)
   aura::Env::DeleteInstance();
 #endif
 }
 
 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;
 }