Fall back to the application locale if a profile one doesn't exist on ChromeOS.

chrome/browser/search/hotword_service.cc

 // Copyright 2013 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/search/hotword_service.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 124 matching lines @@
 
 ExtensionService* GetExtensionService(Profile* profile) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile);
   return extension_system ?  extension_system->extension_service() : NULL;
 }
 
 std::string GetCurrentLocale(Profile* profile) {
-  std::string locale =
 #if defined(OS_CHROMEOS)
-      // On ChromeOS locale is per-profile.
+  std::string profile_locale =
       profile->GetPrefs()->GetString(prefs::kApplicationLocale);
-#else
-      g_browser_process->GetApplicationLocale();
+  if (!profile_locale.empty()) {
+    // On ChromeOS locale is per-profile, but only if set.
+    return profile_locale;
+  }
 #endif
-  return locale;
+  return g_browser_process->GetApplicationLocale();
 }
 
 }  // namespace
 
 namespace hotword_internal {
 // Constants for the hotword field trial.
 const char kHotwordFieldTrialName[] = "VoiceTrigger";
 const char kHotwordFieldTrialDisabledGroupName[] = "Disabled";
 // Old preference constant.
 const char kHotwordUnusablePrefName[] = "hotword.search_enabled";
@@ skipping 328 matching lines @@
     return false;
 
   std::string previous_locale =
       profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage);
   std::string locale = GetCurrentLocale(profile_);
 
   // If it's a new locale, then the old extension should be uninstalled.
   return locale != previous_locale &&
       HotwordService::DoesHotwordSupportLanguage(profile_);
 }