[cros] Fix default profile photo detection.

chrome/browser/chromeos/login/profile_image_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/chromeos/login/profile_image_downloader.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 33 matching lines @@
 // Path in JSON dictionary to user's photo thumbnail URL.
 const char kPhotoThumbnailURLPath[] = "entry.gphoto$thumbnail.$t";
 // Path format for specifying thumbnail's size.
 const char kThumbnailSizeFormat[] = "s%d-c";
 // Default Picasa thumbnail size.
 const int kDefaultThumbnailSize = 64;
 
 // Separator of URL path components.
 const char kURLPathSeparator = '/';
 
-// Photo ID of old low-res default profile picture (base64 of 0).
-const char kOldDefaultPhotoId[] = "AAAAAAAAAAA";
+// Photo ID of the Picasa Web Albums profile picture (base64 of 0).
+const char kPicasaPhotoId[] = "AAAAAAAAAAA";
 
-// Current photo ID of the current profile picture (base64 of 2).
-const char kDefaultPhotoId[] = "AAAAAAAAAAI";
+// Photo version of the default PWA profile picture (base64 of 1).
+const char kDefaultPicasaPhotoVersion[] = "AAAAAAAAAAE";
 
-// Photo version of the current profile picture (base64 of 0).
-const char kDefaultPhotoVersion[] = "AAAAAAAAAAA";
+// 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";
 
 // Number of path components in profile picture URL.
 const size_t kProfileImageURLPathComponentsCount = 7;
 
 // Index of path component with photo ID.
 const int kPhotoIdPathComponentIndex = 2;
 
 // Index of path component with photo version.
 const int kPhotoVersionPathComponentIndex = 3;
 
@@ skipping 68 matching lines @@
   base::SplitString(image_url_object.path(),
                     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];
-  return (photo_id == kOldDefaultPhotoId) ||
-         (photo_id == kDefaultPhotoId &&
-          photo_version == kDefaultPhotoVersion);
+
+  // 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));
 }
 
 ProfileImageDownloader::ProfileImageDownloader(Delegate* delegate)
     : delegate_(delegate) {
 }
 
 void ProfileImageDownloader::Start() {
   VLOG(1) << "Starting profile image downloader...";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 118 matching lines @@
   } else {
     if (token_details->service() == GaiaConstants::kPicasaService) {
       LOG(WARNING) << "ProfileImageDownloader: token request failed";
       if (delegate_)
         delegate_->OnDownloadFailure();
     }
   }
 }
 
 }  // namespace chromeos