Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/search/hotword_service.cc

Issue 349073004: Cleanup: Remove deprecated Profile::GetExtensionService(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/profiles/profile.h ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/speech/tts_extension_loader_chromeos.cc » ('j') | chrome/browser/sync/test/integration/two_client_apps_sync_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search/hotword_service.cc
diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc
index b409ee9e544d36d0c9028f0943abf5ee25521750..f7f8aeddb8ebf2d4bf0b360ea86f9d669160dc1f 100644
--- a/chrome/browser/search/hotword_service.cc
+++ b/chrome/browser/search/hotword_service.cc
@@ -140,13 +140,11 @@ void RecordErrorMetrics(int error_message) {
}
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) {
« chrome/browser/profiles/profile.h ('K') | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/speech/tts_extension_loader_chromeos.cc » ('j') | chrome/browser/sync/test/integration/two_client_apps_sync_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698