Revert 97049 - Trying to see if it fixes sync_integration_tests

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/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
@@ skipping 58 matching lines @@
     image_url_list.Append(Value::CreateStringValue(url));
   }
 
   web_ui_->CallJavascriptFunction(
       "ManageProfileOverlay.receiveDefaultProfileIcons",
       image_url_list);
 }
 
 void ManageProfileHandler::SendProfileNames() {
   ProfileInfoCache& cache =
-      g_browser_process->profile_manager()->GetMutableProfileInfo();
+      g_browser_process->profile_manager()->GetProfileInfoCache();
   DictionaryValue profile_name_dict;
   for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i)
     profile_name_dict.SetBoolean(UTF16ToUTF8(cache.GetNameOfProfileAtIndex(i)),
                                  true);
 
   web_ui_->CallJavascriptFunction("ManageProfileOverlay.receiveProfileNames",
                                   profile_name_dict);
 }
 
 void ManageProfileHandler::SetProfileNameAndIcon(const ListValue* args) {
   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()->GetMutableProfileInfo();
+      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;
 
   cache.SetNameOfProfileAtIndex(profile_index, new_profile_name);
 
@@ skipping 10 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;
 
   g_browser_process->profile_manager()->ScheduleProfileForDeletion(
       profile_file_path);
 }