Cleanup of r71320 commit.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 1333 matching lines @@
 void ProfileImpl::ChangeApplicationLocale(
     const std::string& locale, bool keep_local) {
   if (locale.empty()) {
     NOTREACHED();
     return;
   }
   if (keep_local) {
     GetPrefs()->SetString(prefs::kApplicationLocaleOverride, locale);
   } else {
     GetPrefs()->SetString(prefs::kApplicationLocale, locale);
-    GetPrefs()->SetString(prefs::kApplicationLocaleOverride, "");
+    GetPrefs()->ClearPref(prefs::kApplicationLocaleOverride);
   }
   GetPrefs()->SetString(prefs::kApplicationLocaleBackup, locale);
   GetPrefs()->ClearPref(prefs::kApplicationLocaleAccepted);
   // We maintain kApplicationLocale property in both a global storage
   // and user's profile.  Global property determines locale of login screen,
   // while user's profile determines his personal locale preference.
   g_browser_process->local_state()->SetString(
       prefs::kApplicationLocale, locale);
 
   GetPrefs()->SavePersistentPrefs();
@@ skipping 24 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new PrerenderManager(this);
   return prerender_manager_;
 }