Cleanup: Remove deprecated Profile::GetExtensionService().

chrome/browser/chromeos/offline/offline_load_page.cc

 // Copyright (c) 2012 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/chromeos/offline/offline_load_page.h"
 
 #include "apps/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/localized_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
@@ skipping 37 matching lines @@
   // The offline page for app has icons and slightly different message.
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
   DCHECK(profile);
   const extensions::Extension* extension = NULL;
   ExtensionService* extensions_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
 
   // Extension service does not exist in test.
   if (extensions_service)
     extension = extensions_service->extensions()->GetHostedAppByURL(url_);

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

If you wanted bonus points, you could make this
ExtensionRegistry::enabled_extensions().GetHostedAppByURL(), and then remove the
extension_service.h include. :)

[Lei Zhang, 2014/06/25 19:58:31]

Done.

 
   if (extension && !extension->from_bookmark()) {
     LocalizedError::GetAppErrorStrings(url_, extension, &error_strings);
     resource_id = IDR_OFFLINE_APP_LOAD_HTML;
   } else {
     const std::string locale = g_browser_process->GetApplicationLocale();
     const std::string accept_languages =
         profile->GetPrefs()->GetString(prefs::kAcceptLanguages);
     LocalizedError::GetStrings(net::ERR_INTERNET_DISCONNECTED,
                                net::kErrorDomain, url_, false, false, locale,
                                accept_languages,
                                scoped_ptr<LocalizedError::ErrorPageParams>(),
                                &error_strings);
     resource_id = IDR_OFFLINE_NET_LOAD_HTML;
   }
 
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           resource_id));
   // "t" is the id of the templates root node.
   return webui::GetTemplatesHtml(template_html, &error_strings, "t");
 }
 
- void OfflineLoadPage::OverrideRendererPrefs(
-      content::RendererPreferences* prefs) {
+void OfflineLoadPage::OverrideRendererPrefs(
+    content::RendererPreferences* prefs) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
   renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);
 }
 
 void OfflineLoadPage::OnProceed() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   proceeded_ = true;
   NotifyBlockingPageComplete(true);
 }
@@ skipping 11 matching lines @@
   // The Jasonified response has quotes, remove them.
   if (command.length() > 1 && command[0] == '"') {
     command = command.substr(1, command.length() - 2);
   }
   // TODO(oshima): record action for metrics.
   if (command == "open_network_settings") {
     ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings("");
   } else if (command == "open_connectivity_diagnostics") {
     Profile* profile = Profile::FromBrowserContext(
         web_contents_->GetBrowserContext());
-    const extensions::Extension* extension = profile->GetExtensionService()->
-        GetInstalledExtension("kodldpbjkkmmnilagfdheibampofhaom");
+    const extensions::Extension* extension =
+        extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
+            "kodldpbjkkmmnilagfdheibampofhaom",
+            extensions::ExtensionRegistry::EVERYTHING);
     apps::LaunchPlatformAppWithUrl(profile, extension, "",
                                    GURL::EmptyGURL(), GURL::EmptyGURL());
 
   } else {
     LOG(WARNING) << "Unknown command:" << cmd;
   }
 }
 
 void OfflineLoadPage::NotifyBlockingPageComplete(bool proceed) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE, base::Bind(callback_, proceed));
 }
 
 void OfflineLoadPage::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const bool online = type != net::NetworkChangeNotifier::CONNECTION_NONE;
   DVLOG(1) << "ConnectionTypeObserver notification received: state="
            << (online ? "online" : "offline");
   if (online) {
     net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 }  // namespace chromeos