Do not use local override for language settings: always sync.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index e0d342941cbdf49c93f320fd970f1d3610e040e9..be0491058ea954b73e5b4f6a27a764fa84cd5c26 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -1366,18 +1366,16 @@ PromoCounter* ProfileImpl::GetInstantPromoCounter() {
 }
 
 #if defined(OS_CHROMEOS)
-void ProfileImpl::ChangeApplicationLocale(
-    const std::string& locale, bool keep_local) {
+void ProfileImpl::ChangeApplicationLocale(const std::string& locale) {
   if (locale.empty()) {
     NOTREACHED();
     return;
   }
-  if (keep_local) {
-    GetPrefs()->SetString(prefs::kApplicationLocaleOverride, locale);
-  } else {
-    GetPrefs()->SetString(prefs::kApplicationLocale, locale);
-    GetPrefs()->ClearPref(prefs::kApplicationLocaleOverride);
-  }
+  GetPrefs()->SetString(prefs::kApplicationLocale, locale);
+  // We keep kApplicationLocaleBackup value as a reference.  In case value
+  // of kApplicationLocale preference would change due to sync from other
+  // device then kApplicationLocaleBackup value will trigger and allow us
+  // to show notification about automatic locale change in LocaleChangeGuard.
   GetPrefs()->SetString(prefs::kApplicationLocaleBackup, locale);
   GetPrefs()->ClearPref(prefs::kApplicationLocaleAccepted);
   // We maintain kApplicationLocale property in both a global storage