summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authormsarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 21:24:25 +0000
committermsarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 21:26:41 +0000
commit8153ccfd454ff0540136b057f28b97b87e90cbc9 (patch)
treec6f8aafe5c58979d27048a168c4b01da43fd648c /ios
parentb733d24449f2061bb8238ce6d39d6de2e50f7952 (diff)
downloadchromium_src-8153ccfd454ff0540136b057f28b97b87e90cbc9.zip
chromium_src-8153ccfd454ff0540136b057f28b97b87e90cbc9.tar.gz
chromium_src-8153ccfd454ff0540136b057f28b97b87e90cbc9.tar.bz2
Remove MutableProfileOAuth2TokenService on iOS.
Shared Authentication is the only supported scheme starting with M39. This CL removes the dependency on MutableProfileOAuth2TokenService on iOS. BUG=233117 Review URL: https://codereview.chromium.org/489113003 Cr-Commit-Position: refs/heads/master@{#291189} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ios')
-rw-r--r--ios/public/provider/components/signin/browser/profile_oauth2_token_service_ios_provider.h3
-rw-r--r--ios/public/test/fake_profile_oauth2_token_service_ios_provider.h5
-rw-r--r--ios/public/test/fake_profile_oauth2_token_service_ios_provider.mm9
3 files changed, 1 insertions, 16 deletions
diff --git a/ios/public/provider/components/signin/browser/profile_oauth2_token_service_ios_provider.h b/ios/public/provider/components/signin/browser/profile_oauth2_token_service_ios_provider.h
index d6f5238..01694bd 100644
--- a/ios/public/provider/components/signin/browser/profile_oauth2_token_service_ios_provider.h
+++ b/ios/public/provider/components/signin/browser/profile_oauth2_token_service_ios_provider.h
@@ -49,9 +49,6 @@ class ProfileOAuth2TokenServiceIOSProvider {
ProfileOAuth2TokenServiceIOSProvider() {};
virtual ~ProfileOAuth2TokenServiceIOSProvider() {};
- // Returns whether authentication is using the shared authentication library.
- virtual bool IsUsingSharedAuthentication() const = 0;
-
// Initializes the shared authentication library. This method should be called
// when loading credentials if the user is signed in to Chrome via the shared
// authentication library.
diff --git a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
index 2ca953a..a3ae09d 100644
--- a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
+++ b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.h
@@ -22,7 +22,6 @@ class FakeProfileOAuth2TokenServiceIOSProvider
virtual ~FakeProfileOAuth2TokenServiceIOSProvider();
// ProfileOAuth2TokenServiceIOSProvider
- virtual bool IsUsingSharedAuthentication() const OVERRIDE;
virtual void InitializeSharedAuthentication() OVERRIDE;
virtual void GetAccessToken(const std::string& account_id,
@@ -40,9 +39,6 @@ class FakeProfileOAuth2TokenServiceIOSProvider
void AddAccount(const std::string& account_id);
void SetAccounts(const std::vector<std::string>& accounts);
void ClearAccounts();
- void set_using_shared_authentication(bool is_using_shared_authentication) {
- is_using_shared_authentication_ = is_using_shared_authentication;
- }
// Issues access token responses.
void IssueAccessTokenForAllRequests();
@@ -52,7 +48,6 @@ class FakeProfileOAuth2TokenServiceIOSProvider
typedef std::pair<std::string, AccessTokenCallback> AccessTokenRequest;
std::vector<std::string> accounts_;
- bool is_using_shared_authentication_;
std::vector<AccessTokenRequest> requests_;
DISALLOW_COPY_AND_ASSIGN(FakeProfileOAuth2TokenServiceIOSProvider);
diff --git a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.mm b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.mm
index e6ff73d..4928773 100644
--- a/ios/public/test/fake_profile_oauth2_token_service_ios_provider.mm
+++ b/ios/public/test/fake_profile_oauth2_token_service_ios_provider.mm
@@ -12,8 +12,7 @@
namespace ios {
FakeProfileOAuth2TokenServiceIOSProvider::
- FakeProfileOAuth2TokenServiceIOSProvider()
- : is_using_shared_authentication_(true) {}
+ FakeProfileOAuth2TokenServiceIOSProvider() {}
FakeProfileOAuth2TokenServiceIOSProvider::
~FakeProfileOAuth2TokenServiceIOSProvider() {}
@@ -24,7 +23,6 @@ void FakeProfileOAuth2TokenServiceIOSProvider::GetAccessToken(
const std::string& client_secret,
const std::set<std::string>& scopes,
const AccessTokenCallback& callback) {
- DCHECK(is_using_shared_authentication_);
requests_.push_back(AccessTokenRequest(account_id, callback));
}
@@ -73,11 +71,6 @@ void FakeProfileOAuth2TokenServiceIOSProvider::
requests_.clear();
}
-bool FakeProfileOAuth2TokenServiceIOSProvider::IsUsingSharedAuthentication()
- const {
- return is_using_shared_authentication_;
-}
-
void
FakeProfileOAuth2TokenServiceIOSProvider::InitializeSharedAuthentication() {}