Implement the new Sync Confirmation dialog on Linux and Windows.

chrome/browser/profiles/profile_downloader.cc

 // Copyright (c) 2013 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 <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_downloader_delegate.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 #include "skia/ext/image_operations.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Template for optional authorization header when using an OAuth access token.
 const char kAuthorizationHeader[] =
     "Authorization: Bearer %s";
 
-// Path format for specifying thumbnail's size.
-const char kThumbnailSizeFormat[] = "s%d-c";
-// Default thumbnail size.
-const int kDefaultThumbnailSize = 64;
-
 // 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";
 
 // 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|.
-// For example, if |size| was set to 256 and |old_url| was either:
-//   https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/photo.jpg
-//   or
-//   https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s64-c/photo.jpg
-// then return value in |new_url| would be:
-//   https://example.com/--Abc/AAAAAAAAAAI/AAAAAAAAACQ/Efg/s256-c/photo.jpg
-bool GetImageURLWithSize(const GURL& old_url, int size, GURL* new_url) {
-  DCHECK(new_url);
-  std::vector<std::string> components = base::SplitString(
-      old_url.path(), std::string(1, kURLPathSeparator),
-      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
-  if (components.size() == 0)
-    return false;
-
-  const std::string& old_spec = old_url.spec();
-  std::string default_size_component(
-      base::StringPrintf(kThumbnailSizeFormat, kDefaultThumbnailSize));
-  std::string new_size_component(
-      base::StringPrintf(kThumbnailSizeFormat, size));
-
-  size_t pos = old_spec.find(default_size_component);
-  size_t end = std::string::npos;
-  if (pos != std::string::npos) {
-    // The default size is already specified in the URL so it needs to be
-    // replaced with the new size.
-    end = pos + default_size_component.size();
-  } else {
-    // The default size is not in the URL so try to insert it before the last
-    // component.
-    const std::string& file_name = old_url.ExtractFileName();
-    if (!file_name.empty()) {
-      pos = old_spec.find(file_name);
-      end = pos - 1;
-    }
-  }
-
-  if (pos != std::string::npos) {
-    std::string new_spec = old_spec.substr(0, pos) + new_size_component +
-                           old_spec.substr(end);
-    *new_url = GURL(new_spec);
-    return new_url->is_valid();
-  }
-
-  // We can't set the image size, just use the default size.
-  *new_url = old_url;
-  return true;
-}
-
 }  // namespace
 
 // static
 bool ProfileDownloader::IsDefaultProfileImageURL(const std::string& url) {
   if (url.empty())
     return true;
 
   GURL image_url_object(url);
   DCHECK(image_url_object.is_valid());
   VLOG(1) << "URL to check for default image: " << image_url_object.spec();
@@ skipping 75 matching lines @@
   return profile_picture_;
 }
 
 ProfileDownloader::PictureStatus ProfileDownloader::GetProfilePictureStatus()
     const {
   return picture_status_;
 }
 
 std::string ProfileDownloader::GetProfilePictureURL() const {
   GURL url;
-  if (GetImageURLWithSize(GURL(account_info_.picture_url),
-                          delegate_->GetDesiredImageSideLength(),
-                          &url)) {
+  if (profiles::GetImageURLWithThumbnailSize(
+          GURL(account_info_.picture_url),
+          delegate_->GetDesiredImageSideLength(),
+          &url)) {
     return url.spec();
   }
   return account_info_.picture_url;
 }
 
 void ProfileDownloader::StartFetchingImage() {
   VLOG(1) << "Fetching user entry with token: " << auth_token_;
   account_info_ = account_tracker_service_->GetAccountInfo(account_id_);
 
   if (delegate_->IsPreSignin()) {
@@ skipping 162 matching lines @@
     // downloader has been waiting so we need to fetch the image data now.
     if (waiting_for_account_info_) {
       waiting_for_account_info_ = false;
       // FetchImageData might call the delegate's OnProfileDownloadSuccess
       // synchronously, causing |this| to be deleted so there should not be more
       // code after it.
       FetchImageData();
     }
   }
 }