Commit f40bd433 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

[s13n] Convert c/b/sync/profile_sync_test_util.cc away from SigninManager

BUG=903885

Bots are true but mac_chromium_rel_gn, which is sick. Adding "notry".

NOTRY=true

Change-Id: I6907a8c978a4adbbbca2f5e12122c90564607b1c
Reviewed-on: https://chromium-review.googlesource.com/c/1351153
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611110}
parent 30327733
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h"
#include "chrome/browser/sync/chrome_sync_client.h" #include "chrome/browser/sync/chrome_sync_client.h"
#include "chrome/common/channel_info.h" #include "chrome/common/channel_info.h"
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "components/browser_sync/profile_sync_test_util.h" #include "components/browser_sync/profile_sync_test_util.h"
#include "components/invalidation/impl/invalidation_switches.h" #include "components/invalidation/impl/invalidation_switches.h"
#include "components/invalidation/impl/profile_invalidation_provider.h" #include "components/invalidation/impl/profile_invalidation_provider.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/sync/driver/startup_controller.h" #include "components/sync/driver/startup_controller.h"
#include "components/sync/driver/sync_api_component_factory_mock.h" #include "components/sync/driver/sync_api_component_factory_mock.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
...@@ -77,9 +76,14 @@ ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest( ...@@ -77,9 +76,14 @@ ProfileSyncService::InitParams CreateProfileSyncServiceParamsForTest(
} }
std::unique_ptr<TestingProfile> MakeSignedInTestingProfile() { std::unique_ptr<TestingProfile> MakeSignedInTestingProfile() {
auto profile = std::make_unique<TestingProfile>(); std::unique_ptr<TestingProfile> profile =
SigninManagerFactory::GetForProfile(profile.get()) IdentityTestEnvironmentProfileAdaptor::
->SetAuthenticatedAccountInfo("12345", "foo"); CreateProfileForIdentityTestEnvironment();
auto identity_test_env_profile_adaptor =
std::make_unique<IdentityTestEnvironmentProfileAdaptor>(profile.get());
identity_test_env_profile_adaptor->identity_test_env()->SetPrimaryAccount(
"test@mail.com");
return profile; return profile;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment