| Index: components/signin/core/browser/account_reconcilor.cc
|
| diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
|
| index accb6da262bd74f3075f342c843cf8e85f299eec..154a39386cd311ec972c3852e3abf5e186a3769a 100644
|
| --- a/components/signin/core/browser/account_reconcilor.cc
|
| +++ b/components/signin/core/browser/account_reconcilor.cc
|
| @@ -16,6 +16,7 @@
|
| #include "components/signin/core/browser/profile_oauth2_token_service.h"
|
| #include "components/signin/core/browser/signin_client.h"
|
| #include "components/signin/core/browser/signin_oauth_helper.h"
|
| +#include "components/signin/core/common/profile_management_switches.h"
|
| #include "google_apis/gaia/gaia_auth_fetcher.h"
|
| #include "google_apis/gaia/gaia_auth_util.h"
|
| #include "google_apis/gaia/gaia_constants.h"
|
| @@ -201,6 +202,7 @@ AccountReconcilor::AccountReconcilor(ProfileOAuth2TokenService* token_service,
|
| are_gaia_accounts_set_(false),
|
| requests_(NULL) {
|
| VLOG(1) << "AccountReconcilor::AccountReconcilor";
|
| + noop_only_mode_ = !switches::IsNewProfileManagement();
|
| }
|
|
|
| AccountReconcilor::~AccountReconcilor() {
|
| @@ -376,6 +378,8 @@ void AccountReconcilor::GoogleSignedOut(const std::string& username) {
|
| }
|
|
|
| void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
|
| + if (noop_only_mode_)
|
| + return;
|
| VLOG(1) << "AccountReconcilor::PerformMergeAction: " << account_id;
|
| merge_session_helper_.LogIn(account_id);
|
| }
|
| @@ -409,6 +413,8 @@ void AccountReconcilor::FinishRemoveAction(
|
|
|
| void AccountReconcilor::PerformAddToChromeAction(const std::string& account_id,
|
| int session_index) {
|
| + if (noop_only_mode_)
|
| + return;
|
| VLOG(1) << "AccountReconcilor::PerformAddToChromeAction:"
|
| << " account=" << account_id << " session_index=" << session_index;
|
|
|
| @@ -419,6 +425,8 @@ void AccountReconcilor::PerformAddToChromeAction(const std::string& account_id,
|
| }
|
|
|
| void AccountReconcilor::PerformLogoutAllAccountsAction() {
|
| + if (noop_only_mode_)
|
| + return;
|
| VLOG(1) << "AccountReconcilor::PerformLogoutAllAccountsAction";
|
| merge_session_helper_.LogOutAllAccounts();
|
| }
|
|
|