Upstream ProfileOAuth2TokenServiceProviderImpl.

ios/chrome/browser/signin/oauth2_token_service_factory.mm

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/common/signin_pref_names.h"
 #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/signin/account_tracker_service_factory.h"
+#include "ios/chrome/browser/signin/profile_oauth2_token_service_ios_provider_impl.h"
 #include "ios/chrome/browser/signin/signin_client_factory.h"
 #include "ios/chrome/browser/signin/signin_error_controller_factory.h"
-#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 
 OAuth2TokenServiceFactory::OAuth2TokenServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "ProfileOAuth2TokenService",
           BrowserStateDependencyManager::GetInstance()) {
   DependsOn(ios::AccountTrackerServiceFactory::GetInstance());
   DependsOn(SigninClientFactory::GetInstance());
   DependsOn(ios::SigninErrorControllerFactory::GetInstance());
 }
 
@@ skipping 18 matching lines @@
 }
 
 std::unique_ptr<KeyedService>
 OAuth2TokenServiceFactory::BuildServiceInstanceFor(
     web::BrowserState* context) const {
   ios::ChromeBrowserState* chrome_browser_state =
       ios::ChromeBrowserState::FromBrowserState(context);
   ProfileOAuth2TokenServiceIOSDelegate* delegate =
       new ProfileOAuth2TokenServiceIOSDelegate(
           SigninClientFactory::GetForBrowserState(chrome_browser_state),
-          ios::GetChromeBrowserProvider()
-              ->GetProfileOAuth2TokenServiceIOSProvider(),
+          base::WrapUnique(new ProfileOAuth2TokenServiceIOSProviderImpl()),

[sdefresne, 2016/07/06 08:43:28]

ditto, base::MakeUnique<ProfileOAuth2TokenServiceIOSProviderImpl>()

[bzanotti, 2016/07/06 11:02:21]

Done.

           ios::AccountTrackerServiceFactory::GetForBrowserState(
               chrome_browser_state),
           ios::SigninErrorControllerFactory::GetForBrowserState(
               chrome_browser_state));
   return base::WrapUnique(new ProfileOAuth2TokenService(delegate));
 }