[iOS] Remove const in some methods of ChromeIdentityService 3/5

The goal of those 5 patches is to remove const on the following methods:
 * IsValidIdentity()
 * GetIdentityWithEmail()
 * GetIdentityWithGaiaID()
 * GetCanonicalizeEmailsForAllIdentities()
 * HasIdentities()
 * GetAllIdentities()
 * GetAllIdentitiesSortedForDisplay()

This is required for crrev.com/i/3208484, to not start async identity
fetch in ChromeIdentityServiceImpl instance when the cache is not
populated.

 * crrev.com/c/2345305 Add temporary methods
 * crrev.com/i/3201649 Switch to the temporary methods
=> crrev.com/c/2345146 Remove const in the methods
 * crrev.com/i/3201650 Switch back the original methods
 * crrev.com/c/2344467 Remove temporary methods

Bug: 897470
Change-Id: Id1f2c88442b835472e54a5bc74516780460e3b89
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345146
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Nohemi Fernandez <fernandex@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796861}

ios/public/provider/chrome/browser/signin/chrome_identity_service.h

@@ -153,40 +153,38 @@ class ChromeIdentityService {
 
   // Returns YES if |identity| is valid and if the service has it in its list of
   // identitites.
-  virtual bool IsValidIdentity(ChromeIdentity* identity) const;
+  virtual bool IsValidIdentity(ChromeIdentity* identity);
   virtual bool IsValidIdentityTemporary(ChromeIdentity* identity) const;
 
   // Returns the chrome identity having the email equal to |email| or |nil| if
   // no matching identity is found.
-  virtual ChromeIdentity* GetIdentityWithEmail(const std::string& email) const;
+  virtual ChromeIdentity* GetIdentityWithEmail(const std::string& email);
   virtual ChromeIdentity* GetIdentityWithEmailTemporary(
       const std::string& email) const;
 
   // Returns the chrome identity having the gaia ID equal to |gaia_id| or |nil|
   // if no matching identity is found.
-  virtual ChromeIdentity* GetIdentityWithGaiaID(
-      const std::string& gaia_id) const;
+  virtual ChromeIdentity* GetIdentityWithGaiaID(const std::string& gaia_id);
   virtual ChromeIdentity* GetIdentityWithGaiaIDTemporary(
       const std::string& gaia_id) const;
 
   // Returns the canonicalized emails for all identities.
-  virtual std::vector<std::string> GetCanonicalizeEmailsForAllIdentities()
-      const;
+  virtual std::vector<std::string> GetCanonicalizeEmailsForAllIdentities();
   virtual std::vector<std::string>
   GetCanonicalizeEmailsForAllIdentitiesTemporary() const;
 
   // Returns true if there is at least one identity.
-  virtual bool HasIdentities() const;
+  virtual bool HasIdentities();
   virtual bool HasIdentitiesTemporary() const;
 
   // Returns all ChromeIdentity objects in an array.
-  virtual NSArray* GetAllIdentities() const;
+  virtual NSArray* GetAllIdentities();
   virtual NSArray* GetAllIdentitiesTemporary() const;
 
   // Returns all ChromeIdentity objects sorted by the ordering used in the
   // account manager, which is typically based on the keychain ordering of
   // accounts.
-  virtual NSArray* GetAllIdentitiesSortedForDisplay() const;
+  virtual NSArray* GetAllIdentitiesSortedForDisplay();
   virtual NSArray* GetAllIdentitiesSortedForDisplayTemporary() const;
 
   // Forgets the given identity on the device. This method logs the user out.

ios/public/provider/chrome/browser/signin/chrome_identity_service.mm

@@ -61,7 +61,7 @@ ChromeIdentityService::CreateChromeIdentityInteractionManager(
   return nil;
 }
 
-bool ChromeIdentityService::IsValidIdentity(ChromeIdentity* identity) const {
+bool ChromeIdentityService::IsValidIdentity(ChromeIdentity* identity) {
   return IsValidIdentityTemporary(identity);
 }
 
@@ -71,7 +71,7 @@ bool ChromeIdentityService::IsValidIdentityTemporary(
 }
 
 ChromeIdentity* ChromeIdentityService::GetIdentityWithEmail(
-    const std::string& email) const {
+    const std::string& email) {
   return GetIdentityWithEmailTemporary(email);
 }
 
@@ -81,7 +81,7 @@ ChromeIdentity* ChromeIdentityService::GetIdentityWithEmailTemporary(
 }
 
 ChromeIdentity* ChromeIdentityService::GetIdentityWithGaiaID(
-    const std::string& gaia_id) const {
+    const std::string& gaia_id) {
   return GetIdentityWithGaiaIDTemporary(gaia_id);
 }
 
@@ -91,7 +91,7 @@ ChromeIdentity* ChromeIdentityService::GetIdentityWithGaiaIDTemporary(
 }
 
 std::vector<std::string>
-ChromeIdentityService::GetCanonicalizeEmailsForAllIdentities() const {
+ChromeIdentityService::GetCanonicalizeEmailsForAllIdentities() {
   return GetCanonicalizeEmailsForAllIdentitiesTemporary();
 }
 
@@ -100,7 +100,7 @@ ChromeIdentityService::GetCanonicalizeEmailsForAllIdentitiesTemporary() const {
   return std::vector<std::string>();
 }
 
-bool ChromeIdentityService::HasIdentities() const {
+bool ChromeIdentityService::HasIdentities() {
   return HasIdentitiesTemporary();
 }
 
@@ -108,7 +108,7 @@ bool ChromeIdentityService::HasIdentitiesTemporary() const {
   return false;
 }
 
-NSArray* ChromeIdentityService::GetAllIdentities() const {
+NSArray* ChromeIdentityService::GetAllIdentities() {
   return GetAllIdentitiesTemporary();
 }
 
@@ -116,7 +116,7 @@ NSArray* ChromeIdentityService::GetAllIdentitiesTemporary() const {
   return nil;
 }
 
-NSArray* ChromeIdentityService::GetAllIdentitiesSortedForDisplay() const {
+NSArray* ChromeIdentityService::GetAllIdentitiesSortedForDisplay() {
   return GetAllIdentitiesSortedForDisplayTemporary();
 }
 

ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h

@@ -39,12 +39,11 @@ class FakeChromeIdentityService : public ChromeIdentityService {
       ChromeBrowserState* browser_state,
       id<ChromeIdentityInteractionManagerDelegate> delegate) const;
 
-  bool IsValidIdentity(ChromeIdentity* identity) const override;
-  ChromeIdentity* GetIdentityWithGaiaID(
-      const std::string& gaia_id) const override;
-  bool HasIdentities() const override;
-  NSArray* GetAllIdentities() const override;
-  NSArray* GetAllIdentitiesSortedForDisplay() const override;
+  bool IsValidIdentity(ChromeIdentity* identity) override;
+  ChromeIdentity* GetIdentityWithGaiaID(const std::string& gaia_id) override;
+  bool HasIdentities() override;
+  NSArray* GetAllIdentities() override;
+  NSArray* GetAllIdentitiesSortedForDisplay() override;
   void ForgetIdentity(ChromeIdentity* identity,
                       ForgetIdentityCallback callback) override;
 

ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.mm

@@ -174,13 +174,12 @@ FakeChromeIdentityService::CreateFakeChromeIdentityInteractionManager(
   return manager;
 }
 
-bool FakeChromeIdentityService::IsValidIdentity(
-    ChromeIdentity* identity) const {
+bool FakeChromeIdentityService::IsValidIdentity(ChromeIdentity* identity) {
   return [identities_ indexOfObject:identity] != NSNotFound;
 }
 
 ChromeIdentity* FakeChromeIdentityService::GetIdentityWithGaiaID(
-    const std::string& gaia_id) const {
+    const std::string& gaia_id) {
   NSString* gaiaID = base::SysUTF8ToNSString(gaia_id);
   NSUInteger index =
       [identities_ indexOfObjectPassingTest:^BOOL(ChromeIdentity* obj,
@@ -193,15 +192,15 @@ ChromeIdentity* FakeChromeIdentityService::GetIdentityWithGaiaID(
   return [identities_ objectAtIndex:index];
 }
 
-bool FakeChromeIdentityService::HasIdentities() const {
+bool FakeChromeIdentityService::HasIdentities() {
   return [identities_ count] > 0;
 }
 
-NSArray* FakeChromeIdentityService::GetAllIdentities() const {
+NSArray* FakeChromeIdentityService::GetAllIdentities() {
   return identities_;
 }
 
-NSArray* FakeChromeIdentityService::GetAllIdentitiesSortedForDisplay() const {
+NSArray* FakeChromeIdentityService::GetAllIdentitiesSortedForDisplay() {
   return identities_;
 }