OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
| 5 #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| 6 |
| 7 #include <utility> |
| 8 |
5 #include "build/build_config.h" | 9 #include "build/build_config.h" |
6 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
7 #include "chrome/browser/signin/account_tracker_service_factory.h" | 11 #include "chrome/browser/signin/account_tracker_service_factory.h" |
8 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 12 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
9 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" | 13 #include "chrome/browser/signin/gaia_cookie_manager_service_factory.h" |
10 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
11 #include "chrome/browser/signin/signin_manager_factory.h" | 15 #include "chrome/browser/signin/signin_manager_factory.h" |
12 #include "chrome/test/base/chrome_render_view_host_test_harness.h" | |
13 #include "chrome/test/base/testing_profile.h" | 16 #include "chrome/test/base/testing_profile.h" |
14 #include "components/signin/core/browser/fake_signin_manager.h" | 17 #include "components/signin/core/browser/fake_signin_manager.h" |
15 | 18 |
16 #if defined(USE_ASH) | 19 #if defined(USE_ASH) |
17 #include "ash/shell.h" | 20 #include "ash/shell.h" |
18 #endif | 21 #endif |
19 | 22 |
20 using content::RenderViewHostTester; | 23 using content::RenderViewHostTester; |
21 using content::RenderViewHostTestHarness; | 24 using content::RenderViewHostTestHarness; |
22 | 25 |
(...skipping 10 matching lines...) Expand all Loading... |
33 scoped_ptr<SigninManagerBase> signin( | 36 scoped_ptr<SigninManagerBase> signin( |
34 new SigninManagerBase(signin_client, account_tracker_service)); | 37 new SigninManagerBase(signin_client, account_tracker_service)); |
35 signin->Initialize(NULL); | 38 signin->Initialize(NULL); |
36 return signin.Pass(); | 39 return signin.Pass(); |
37 #else | 40 #else |
38 scoped_ptr<FakeSigninManager> manager(new FakeSigninManager( | 41 scoped_ptr<FakeSigninManager> manager(new FakeSigninManager( |
39 signin_client, ProfileOAuth2TokenServiceFactory::GetForProfile(profile), | 42 signin_client, ProfileOAuth2TokenServiceFactory::GetForProfile(profile), |
40 account_tracker_service, | 43 account_tracker_service, |
41 GaiaCookieManagerServiceFactory::GetForProfile(profile))); | 44 GaiaCookieManagerServiceFactory::GetForProfile(profile))); |
42 manager->Initialize(g_browser_process->local_state()); | 45 manager->Initialize(g_browser_process->local_state()); |
43 return manager.Pass(); | 46 return std::move(manager); |
44 #endif | 47 #endif |
45 } | 48 } |
46 | 49 |
47 } // namespace | 50 } // namespace |
48 | 51 |
49 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() { | 52 ChromeRenderViewHostTestHarness::ChromeRenderViewHostTestHarness() { |
50 } | 53 } |
51 | 54 |
52 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { | 55 ChromeRenderViewHostTestHarness::~ChromeRenderViewHostTestHarness() { |
53 } | 56 } |
54 | 57 |
55 TestingProfile* ChromeRenderViewHostTestHarness::profile() { | 58 TestingProfile* ChromeRenderViewHostTestHarness::profile() { |
56 return static_cast<TestingProfile*>(browser_context()); | 59 return static_cast<TestingProfile*>(browser_context()); |
57 } | 60 } |
58 | 61 |
59 void ChromeRenderViewHostTestHarness::TearDown() { | 62 void ChromeRenderViewHostTestHarness::TearDown() { |
60 RenderViewHostTestHarness::TearDown(); | 63 RenderViewHostTestHarness::TearDown(); |
61 #if defined(USE_ASH) | 64 #if defined(USE_ASH) |
62 ash::Shell::DeleteInstance(); | 65 ash::Shell::DeleteInstance(); |
63 #endif | 66 #endif |
64 } | 67 } |
65 | 68 |
66 content::BrowserContext* | 69 content::BrowserContext* |
67 ChromeRenderViewHostTestHarness::CreateBrowserContext() { | 70 ChromeRenderViewHostTestHarness::CreateBrowserContext() { |
68 TestingProfile::Builder builder; | 71 TestingProfile::Builder builder; |
69 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), | 72 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), |
70 BuildSigninManagerFake); | 73 BuildSigninManagerFake); |
71 return builder.Build().release(); | 74 return builder.Build().release(); |
72 } | 75 } |
OLD | NEW |