Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/policy/cloud/user_policy_signin_service_android.cc

 // Copyright 2013 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 "chrome/browser/policy/cloud/user_policy_signin_service_android.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
   return enterprise_management::DeviceRegisterRequest::ANDROID_BROWSER;
 }
 
 }  // namespace
 
 UserPolicySigninService::UserPolicySigninService(
     Profile* profile,
     PrefService* local_state,
     scoped_refptr<net::URLRequestContextGetter> request_context,
     DeviceManagementService* device_management_service,
-    AndroidProfileOAuth2TokenService* token_service)
+    ProfileOAuth2TokenService* token_service)
     : UserPolicySigninServiceBase(profile,
                                   local_state,
                                   request_context,
                                   device_management_service),
       weak_factory_(this),
       oauth2_token_service_(token_service) {}
 
 UserPolicySigninService::~UserPolicySigninService() {}
 
 void UserPolicySigninService::RegisterPolicyClient(
@@ skipping 110 matching lines @@
 
 void UserPolicySigninService::CancelPendingRegistration() {
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void UserPolicySigninService::OnRegistrationDone() {
   registration_helper_.reset();
 }
 
 }  // namespace policy