Migrate the rest of the "global" prefs.

chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 153 matching lines @@
 
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->path = profile->GetPath();
   params->clear_local_state_on_exit =
       pref_service->GetBoolean(prefs::kClearSiteDataOnExit);
 
   // Set up Accept-Language and Accept-Charset header values
   params->accept_language = net::HttpUtil::GenerateAcceptLanguageHeader(
       pref_service->GetString(prefs::kAcceptLanguages));
   std::string default_charset =
-      pref_service->GetString(prefs::kGlobalDefaultCharset);
+      pref_service->GetString(prefs::kDefaultCharset);

[Peter Kasting, 2012/05/21 21:37:20]

Nit: Will fit on one line

[falken, 2012/05/22 02:24:21]

Done.

   params->accept_charset =
       net::HttpUtil::GenerateAcceptCharsetHeader(default_charset);
 
   // At this point, we don't know the charset of the referring page
   // where a url request originates from. This is used to get a suggested
   // filename from Content-Disposition header made of raw 8bit characters.
   // Down the road, it can be overriden if it becomes known (for instance,
   // when download request is made through the context menu in a web page).
   // At the moment, it'll remain 'undeterministic' when a user
   // types a URL in the omnibar or click on a download link in a page.
@@ skipping 403 matching lines @@
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }