Reland of: Change default code flag to NewAvatarMenu.

chrome/browser/profiles/profile_avatar_downloader.cc

 // Copyright 2014 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_avatar_downloader.h"
 
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "net/base/load_flags.h"
 
 namespace {
 const char kHighResAvatarDownloadUrlPrefix[] =
     "http://www.gstatic.com/chrome/profile_avatars/";
 }
 
 ProfileAvatarDownloader::ProfileAvatarDownloader(
     size_t icon_index,
     const base::FilePath& profile_path,
     ProfileInfoCache* cache)
     : icon_index_(icon_index),
       profile_path_(profile_path),
+      // The downloader should only execute on desktop platforms.
+#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
+      downloader_active_(true),

[noms (inactive), 2015/03/31 20:51:26]

What do you think about combining this with disable_avatar_download_for_testing_
into one flag? Maybe  disable_avatar_downloading_, which is set to false by
android, ios, chromeos (in the ProfileInfoCache constructor) and tests wherever
it's set now?

[Mike Lerman, 2015/04/01 13:59:51]

We actually don't need this at all anymore, and can just rely on
disable_avatar_download_for_testing_. It's always paired with IsNewAvatarMenu()
which does our OS checks for us already.

+#else
+      downloader_active_(false),
+#endif
       cache_(cache) {
   GURL url(std::string(kHighResAvatarDownloadUrlPrefix) +
            profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index));
   fetcher_.reset(new chrome::BitmapFetcher(url, this));
 }
 
 ProfileAvatarDownloader::~ProfileAvatarDownloader() {
 }
 
 void ProfileAvatarDownloader::Start() {
+  if (!downloader_active_)
+    return;
+
   // In unit tests, the browser process can return a NULL request context.
   net::URLRequestContextGetter* request_context =
       g_browser_process->system_request_context();
   if (request_context)
     fetcher_->Start(
         request_context,
         std::string(),
         net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE,
         net::LOAD_NORMAL);
 }
 
 // BitmapFetcherDelegate overrides.
 void ProfileAvatarDownloader::OnFetchComplete(const GURL url,
                                               const SkBitmap* bitmap) {
-  if (!bitmap || !cache_)
+  if (!bitmap || !cache_ || !downloader_active_)
     return;
 
   // Decode the downloaded bitmap. Ownership of the image is taken by |cache_|.
   gfx::Image image = gfx::Image::CreateFrom1xBitmap(*bitmap);
   cache_->SaveAvatarImageAtPath(&image,
       profiles::GetDefaultAvatarIconFileNameAtIndex(icon_index_),
       profiles::GetPathOfHighResAvatarAtIndex(icon_index_),
       profile_path_);
 }