| 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 17fbf0b418ee685ffeefeee7b3d8efd5b139529e..e340ee7dff094fcbe620844780a355b62f73d9a7 100644
|
| --- a/chrome/test/base/chrome_render_view_host_test_harness.cc
|
| +++ b/chrome/test/base/chrome_render_view_host_test_harness.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "chrome/test/base/chrome_render_view_host_test_harness.h"
|
|
|
| +#include "chrome/browser/signin/signin_manager_factory.h"
|
| +#include "chrome/browser/signin/signin_manager_fake.h"
|
| #include "chrome/test/base/testing_profile.h"
|
|
|
| #if defined(USE_ASH)
|
| @@ -33,9 +35,18 @@ RenderViewHostTester* ChromeRenderViewHostTestHarness::rvh_tester() {
|
| return RenderViewHostTester::For(rvh());
|
| }
|
|
|
| +static ProfileKeyedService* BuildSigninManagerFake(Profile* profile) {
|
| + return new FakeSigninManager(profile);
|
| +}
|
| +
|
| void ChromeRenderViewHostTestHarness::SetUp() {
|
| - if (!browser_context_.get())
|
| - browser_context_.reset(new TestingProfile());
|
| + Profile* profile = Profile::FromBrowserContext(browser_context_.get());
|
| + if (!profile) {
|
| + profile = new TestingProfile();
|
| + browser_context_.reset(profile);
|
| + }
|
| + SigninManagerFactory::GetInstance()->SetTestingFactory(
|
| + profile, BuildSigninManagerFake);
|
| RenderViewHostTestHarness::SetUp();
|
| }
|
|
|
|
|