Fix detection of default G+ profile picture

chrome/browser/profiles/profile_downloader.cc

 // Copyright (c) 2011 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/profiles/profile_downloader.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 46 matching lines @@
 
 // Separator of URL path components.
 const char kURLPathSeparator = '/';
 
 // Photo ID of the Picasa Web Albums profile picture (base64 of 0).
 const char kPicasaPhotoId[] = "AAAAAAAAAAA";
 
 // Photo version of the default PWA profile picture (base64 of 1).
 const char kDefaultPicasaPhotoVersion[] = "AAAAAAAAAAE";
 
-// Photo ID of the Google+ profile picture (base64 of 2).
-const char kGooglePlusPhotoId[] = "AAAAAAAAAAI";
-
-// Photo version of the default Google+ profile picture (base64 of 0).
-const char kDefaultGooglePlusPhotoVersion[] = "AAAAAAAAAAA";
-
 // The minimum number of path components in profile picture URL.
 const size_t kProfileImageURLPathComponentsCount = 6;
 
 // Index of path component with photo ID.
 const int kPhotoIdPathComponentIndex = 2;
 
 // Index of path component with photo version.
 const int kPhotoVersionPathComponentIndex = 3;
 
 // Given an image URL this function builds a new URL set to |size|.
@@ skipping 102 matching lines @@
                     kURLPathSeparator,
                     &path_components);
 
   if (path_components.size() < kProfileImageURLPathComponentsCount)
     return false;
 
   const std::string& photo_id = path_components[kPhotoIdPathComponentIndex];
   const std::string& photo_version =
       path_components[kPhotoVersionPathComponentIndex];
 
-  // There are at least two pairs of (ID, version) for the default photo:
-  // the default Google+ profile photo and the default Picasa profile photo.
-  return ((photo_id == kPicasaPhotoId &&
-           photo_version == kDefaultPicasaPhotoVersion) ||
-          (photo_id == kGooglePlusPhotoId &&
-           photo_version == kDefaultGooglePlusPhotoVersion));
+  // Check that the ID and version match the default Picasa profile photo.
+  return photo_id == kPicasaPhotoId &&
+         photo_version == kDefaultPicasaPhotoVersion;
 }
 
 ProfileDownloader::ProfileDownloader(ProfileDownloaderDelegate* delegate)
     : delegate_(delegate),
       picture_status_(PICTURE_FAILED) {
   DCHECK(delegate_);
 }
 
 void ProfileDownloader::Start() {
   VLOG(1) << "Starting profile downloader...";
@@ skipping 164 matching lines @@
 void ProfileDownloader::OnGetTokenSuccess(const std::string& access_token) {
   auth_token_ = access_token;
   StartFetchingImage();
 }
 
 // Callback for OAuth2AccessTokenFetcher on failure.
 void ProfileDownloader::OnGetTokenFailure(const GoogleServiceAuthError& error) {
   LOG(WARNING) << "ProfileDownloader: token request using refresh token failed";
   delegate_->OnDownloadComplete(this, false);
 }