[cros] Don't succeed if user has default profile picturewq

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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 // URL requesting Picasa API for user info.
 const char kUserEntryURL[] =
     "http://picasaweb.google.com/data/entry/api/user/default?alt=json";
 // 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;
 
+// Path components that identify the default profile picture.
+const char* kDefaultProfileImagePathComponents[] = {
+  "/AAAAAAAAAAI/AAAAAAAAAAA/",
+  "/AAAAAAAAAA/"
+};
+
 }  // namespace
 
 std::string ProfileImageDownloader::GetProfileImageURL(
     const std::string& data) const {
   int error_code = -1;
   std::string error_message;
   scoped_ptr<base::Value> root_value(base::JSONReader::ReadAndReturnError(
       data, false, &error_code, &error_message));
   if (!root_value.get()) {
     LOG(ERROR) << "Error while parsing Picasa user entry response: "
@@ skipping 41 matching lines @@
   }
 
   GURL thumbnail_url(thumbnail_url_string);
   if (!thumbnail_url.is_valid()) {
     LOG(ERROR) << "Thumbnail URL is not valid: " << thumbnail_url_string;
     return std::string();
   }
   return thumbnail_url.spec();
 }
 
+bool ProfileImageDownloader::IsDefaultProfileImageURL(
+    const std::string& url) const {
+  GURL image_url_object(url);
+  DCHECK(image_url_object.is_valid());
+  for (size_t i = 0;
+       i < arraysize(kDefaultProfileImagePathComponents);
+       ++i) {
+    const char* component =
+        kDefaultProfileImagePathComponents[i];
+    if (image_url_object.path().find(component) != std::string::npos)

[Ivan Korotkov, 2011/10/26 20:43:57]

This will match /AAAAAAAAAA/ anywhere in the path. I suggest splitting the URL
by / and matching specific URL parts.

[whywhat, 2011/10/27 13:28:10]

Done.

+      return true;
+  }
+  return false;
+}
+
 ProfileImageDownloader::ProfileImageDownloader(Delegate* delegate)
     : delegate_(delegate) {
 }
 
 void ProfileImageDownloader::Start() {
   VLOG(1) << "Starting profile image downloader...";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   TokenService* service =
       ProfileManager::GetDefaultProfile()->GetTokenService();
@@ skipping 50 matching lines @@
     return;
   }
 
   if (source == user_entry_fetcher_.get()) {
     std::string image_url = GetProfileImageURL(data);
     if (image_url.empty()) {
       if (delegate_)
         delegate_->OnDownloadFailure();
       return;
     }
+    if (IsDefaultProfileImageURL(image_url)) {
+      if (delegate_)
+        delegate_->OnDownloadDefaultImage();
+      return;
+    }
     VLOG(1) << "Fetching profile image from " << image_url;
     profile_image_fetcher_.reset(content::URLFetcher::Create(
         GURL(image_url), content::URLFetcher::GET, this));
     profile_image_fetcher_->SetRequestContext(
         ProfileManager::GetDefaultProfile()->GetRequestContext());
     if (!auth_token_.empty()) {
       profile_image_fetcher_->SetExtraRequestHeaders(
           base::StringPrintf(kAuthorizationHeader, auth_token_.c_str()));
     }
     profile_image_fetcher_->Start();
@@ skipping 41 matching lines @@
   } else {
     if (token_details->service() == GaiaConstants::kPicasaService) {
       LOG(WARNING) << "ProfileImageDownloader: token request failed";
       if (delegate_)
         delegate_->OnDownloadFailure();
     }
   }
 }
 
 }  // namespace chromeos