Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(165)

Side by Side Diff: ios/chrome/browser/signin/account_reconcilor_factory.cc

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/signin/account_reconcilor_factory.h" 5 #include "ios/chrome/browser/signin/account_reconcilor_factory.h"
6 6
7 #include <utility>
8
7 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
9 #include "components/signin/core/browser/account_reconcilor.h" 11 #include "components/signin/core/browser/account_reconcilor.h"
10 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h" 12 #include "ios/chrome/browser/signin/gaia_cookie_manager_service_factory.h"
11 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" 13 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
12 #include "ios/chrome/browser/signin/signin_client_factory.h" 14 #include "ios/chrome/browser/signin/signin_client_factory.h"
13 #include "ios/chrome/browser/signin/signin_manager_factory.h" 15 #include "ios/chrome/browser/signin/signin_manager_factory.h"
14 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h" 16 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state. h"
15 17
16 namespace ios { 18 namespace ios {
(...skipping 26 matching lines...) Expand all
43 web::BrowserState* context) const { 45 web::BrowserState* context) const {
44 ios::ChromeBrowserState* chrome_browser_state = 46 ios::ChromeBrowserState* chrome_browser_state =
45 ios::ChromeBrowserState::FromBrowserState(context); 47 ios::ChromeBrowserState::FromBrowserState(context);
46 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor( 48 scoped_ptr<AccountReconcilor> reconcilor(new AccountReconcilor(
47 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state), 49 OAuth2TokenServiceFactory::GetForBrowserState(chrome_browser_state),
48 SigninManagerFactory::GetForBrowserState(chrome_browser_state), 50 SigninManagerFactory::GetForBrowserState(chrome_browser_state),
49 SigninClientFactory::GetForBrowserState(chrome_browser_state), 51 SigninClientFactory::GetForBrowserState(chrome_browser_state),
50 GaiaCookieManagerServiceFactory::GetForBrowserState( 52 GaiaCookieManagerServiceFactory::GetForBrowserState(
51 chrome_browser_state))); 53 chrome_browser_state)));
52 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */); 54 reconcilor->Initialize(true /* start_reconcile_if_tokens_available */);
53 return reconcilor.Pass(); 55 return std::move(reconcilor);
54 } 56 }
55 57
56 } // namespace ios 58 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698