Cleanup: Remove deprecated Profile::GetExtensionService().

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/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 122 matching lines @@
     default:
       error = NO_HOTWORD_ERROR;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Hotword.HotwordError",
                             error,
                             NUM_HOTWORD_ERROR_METRICS);
 }
 
 ExtensionService* GetExtensionService(Profile* profile) {
-  CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

[Devlin, 2014/06/25 19:38:48]

nit: I think we have a DCHECK_CURRENTLY_ON now.

 
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile);
-  if (extension_system)
-    return extension_system->extension_service();
-  return NULL;
+  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.
       profile->GetPrefs()->GetString(prefs::kApplicationLocale);
 #else
       g_browser_process->GetApplicationLocale();
 #endif
@@ skipping 339 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_);
 }