Fix detection of default G+ profile picture

Currently we assume that any profile picture URL that contains "AAAAAAAAAAI/AAAAAAAAAAA" represents a default profile picture.

It turns out that this is incorrect. There are valid profile pictures with that URL.

With the OAuth user info API we can simply detect default profile pictures by the existance of the "picture" field in the returned data. Accounts with a default profile picture don't have this field.

BUG=106444
TEST=Compiled and verified that unit tests passed.


Review URL: http://codereview.chromium.org/8801023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113487 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/profiles/profile_downloader.cc

@@ -64,12 +64,6 @@ 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;
 
@@ -192,12 +186,9 @@ bool ProfileDownloader::IsDefaultProfileImageURL(const std::string& url) {
   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)

chrome/browser/profiles/profile_downloader_unittest.cc

@@ -90,8 +90,8 @@ TEST_F(ProfileDownloaderTest, DefaultURL) {
   // Picasa default photo
   EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAA/AAAAAAAAAAE/G/s64-c/photo.jpg"));
-  // G+ default photo
-  EXPECT_TRUE(ProfileDownloader::IsDefaultProfileImageURL(
+  // Not default G+ photo
+  EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(
       "https://example.com/-4/AAAAAAAAAAI/AAAAAAAAAAA/G/photo.jpg"));
   // Not default with 6 components
   EXPECT_FALSE(ProfileDownloader::IsDefaultProfileImageURL(