Revert of Delete "Google Profile photo" for the Active Directory (patchset #2 id:20001 of https://c…

chrome/browser/chromeos/login/screens/user_image_screen.cc

 // Copyright (c) 2012 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/screens/user_image_screen.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 34 matching lines @@
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 constexpr const char kContextKeyIsCameraPresent[] = "isCameraPresent";
 constexpr const char kContextKeyProfilePictureDataURL[] =
     "profilePictureDataURL";
 constexpr const char kContextKeySelectedImageURL[] = "selectedImageURL";
-constexpr const char kContextKeyHasGaiaAccount[] = "hasGaiaAccount";
 
 // Time histogram suffix for profile image download.
 const char kProfileDownloadReason[] = "OOBE";
 
 // Maximum amount of time to wait for the user image to sync.
 // The screen is shown iff sync failed or time limit exceeded.
 const int kSyncTimeoutSeconds = 10;
 
 }  // namespace
 
@@ skipping 143 matching lines @@
     }
   }
   CameraPresenceNotifier::GetInstance()->AddObserver(this);
   view_->Show();
 
   selected_image_ = GetUser()->image_index();
   GetContextEditor().SetString(
       kContextKeySelectedImageURL,
       default_user_image::GetDefaultImageUrl(selected_image_));
 
-  const user_manager::User* user = GetUser();
-  // Fetch profile image for GAIA accounts.
-  if (user && user->HasGaiaAccount()) {
-    GetContextEditor().SetBoolean(kContextKeyHasGaiaAccount, true);
-    GetUserImageManager()->DownloadProfileImage(kProfileDownloadReason);
-  } else {
-    GetContextEditor().SetBoolean(kContextKeyHasGaiaAccount, false);
-  }
+  // Start fetching the profile image.
+  GetUserImageManager()->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void UserImageScreen::Hide() {
   CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
   user_manager::UserManager::Get()->RemoveObserver(this);
   policy_registrar_.reset();
   sync_timer_.reset();
   if (UserImageSyncObserver* sync_observer = GetSyncObserver())
     sync_observer->RemoveObserver(this);
   if (view_)
@@ skipping 102 matching lines @@
 
 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const {
   base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_;
   UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration);
   UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult",
                             static_cast<int>(timed_out),
                             static_cast<int>(SyncResult::COUNT));
 }
 
 }  // namespace chromeos