Revert 112856 - Making profile avatars and names sync.

chrome/browser/ui/webui/options/manage_profile_handler.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/ui/webui/options/manage_profile_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/ui/webui/web_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/pref_names.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 
 ManageProfileHandler::ManageProfileHandler() {
 }
 
 ManageProfileHandler::~ManageProfileHandler() {
 }
 
@@ skipping 101 matching lines @@
 
   Value* file_path_value;
   FilePath profile_file_path;
   if (!args->Get(0, &file_path_value) ||
       !base::GetValueAsFilePath(*file_path_value, &profile_file_path))
     return;
 
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
+  if (profile_index == std::string::npos)
+    return;
 
   string16 new_profile_name;
   if (!args->GetString(1, &new_profile_name))
     return;
 
-  Profile* profile =
-      g_browser_process->profile_manager()->GetProfile(profile_file_path);
-  if (!profile)
-    return;
   if (new_profile_name == cache.GetGAIANameOfProfileAtIndex(profile_index)) {
     // Set the profile to use the GAIA name as the profile name. Note, this
     // is a little weird if the user typed their GAIA name manually but
     // it's not a big deal.
     cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, true);
     // Using the GAIA name as the profile name can invalidate the profile index.
     profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
     if (profile_index == std::string::npos)
       return;
   } else {
-    PrefService* pref_service = profile->GetPrefs();
-    // Updating the profile preference will cause the cache to be updated for
-    // this preference.
-    pref_service->SetString(prefs::kProfileName, UTF16ToUTF8(new_profile_name));
-
+    cache.SetNameOfProfileAtIndex(profile_index, new_profile_name);
     // Changing the profile name can invalidate the profile index.
     profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
     if (profile_index == std::string::npos)
       return;
 
     cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, false);
     // Unsetting the GAIA name as the profile name can invalidate the profile
     // index.
     profile_index = cache.GetIndexOfProfileWithPath(profile_file_path);
     if (profile_index == std::string::npos)
       return;
   }
 
   std::string icon_url;
   if (!args->GetString(2, &icon_url))
     return;
 
   size_t new_icon_index;
   if (icon_url == gaia_picture_url_) {
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, true);
   } else if (cache.IsDefaultAvatarIconUrl(icon_url, &new_icon_index)) {
-    PrefService* pref_service = profile->GetPrefs();
     ProfileMetrics::LogProfileAvatarSelection(new_icon_index);
-    // Updating the profile preference will cause the cache to be updated for
-    // this preference.
-    pref_service->SetInteger(prefs::kProfileAvatarIndex, new_icon_index);
+    cache.SetAvatarIconOfProfileAtIndex(profile_index, new_icon_index);
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, false);
   }
 
   ProfileMetrics::LogProfileUpdate(profile_file_path);
 }
 
 void ManageProfileHandler::DeleteProfile(const ListValue* args) {
   DCHECK(args);
 
   ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::PROFILE_DELETED);
@@ skipping 88 matching lines @@
   if (i == std::string::npos)
     return;
   string16 gaia_name = cache.GetGAIANameOfProfileAtIndex(i);
   if (gaia_name.empty())
     return;
 
   StringValue gaia_name_value(gaia_name);
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.setProfileName",
                                   gaia_name_value);
 }