| Index: chrome/browser/sync/sync_ui_util_unittest.cc
|
| diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc
|
| index 212e7be80e6e2da38341a0b5efceb70fc5b6465e..f84856a87305f6ddeb1960f2caad3a88446099de 100644
|
| --- a/chrome/browser/sync/sync_ui_util_unittest.cc
|
| +++ b/chrome/browser/sync/sync_ui_util_unittest.cc
|
| @@ -7,12 +7,11 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/signin/fake_signin_manager.h"
|
| -#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
|
| +#include "chrome/browser/signin/signin_error_controller_factory.h"
|
| #include "chrome/browser/sync/profile_sync_service_mock.h"
|
| #include "chrome/browser/sync/sync_ui_util.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/signin/core/browser/fake_auth_status_provider.h"
|
| -#include "components/signin/core/browser/profile_oauth2_token_service.h"
|
| #include "components/signin/core/browser/signin_manager.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| @@ -342,8 +341,7 @@ TEST_F(SyncUIUtilTest, DistinctCasesReportUniqueMessageSets) {
|
| FakeSigninManagerForSyncUIUtilTest signin(profile.get());
|
| signin.SetAuthenticatedUsername(kTestUser);
|
| scoped_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
|
| - ProfileOAuth2TokenServiceFactory::GetForProfile(profile.get())->
|
| - signin_error_controller()));
|
| + SigninErrorControllerFactory::GetForProfile(profile.get())));
|
| GetDistinctCase(service, &signin, provider.get(), idx);
|
| base::string16 status_label;
|
| base::string16 link_label;
|
| @@ -382,8 +380,7 @@ TEST_F(SyncUIUtilTest, HtmlNotIncludedInStatusIfNotRequested) {
|
| FakeSigninManagerForSyncUIUtilTest signin(profile.get());
|
| signin.SetAuthenticatedUsername(kTestUser);
|
| scoped_ptr<FakeAuthStatusProvider> provider(new FakeAuthStatusProvider(
|
| - ProfileOAuth2TokenServiceFactory::GetForProfile(profile.get())->
|
| - signin_error_controller()));
|
| + SigninErrorControllerFactory::GetForProfile(profile.get())));
|
| GetDistinctCase(service, &signin, provider.get(), idx);
|
| base::string16 status_label;
|
| base::string16 link_label;
|
|
|