Remove deprecated ExtensionService::GetInstalledExtension() usage

chrome/browser/ui/app_list/app_list_syncable_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/ui/app_list/app_list_syncable_service.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/apps/drive/drive_app_provider.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_prefs.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/extension_app_item.h"
 #include "chrome/browser/ui/app_list/extension_app_model_builder.h"
 #include "chrome/browser/ui/app_list/model_pref_updater.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/constants.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_merge_result.h"
 #include "sync/protocol/sync.pb.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 82 matching lines @@
       id == extensions::kWebStoreAppId)
     return true;
 #if defined(OS_CHROMEOS)
   if (id == file_manager::kFileManagerAppId || id == genius_app::kGeniusAppId)
     return true;
 #endif
   return false;
 }
 
 void UninstallExtension(ExtensionService* service, const std::string& id) {
-  if (service && service->GetInstalledExtension(id)) {
+  if (service) {
+    const extensions::Extension* extension =
+        extensions::ExtensionRegistry::Get(service->profile())
+            ->GetExtensionById(id, extensions::ExtensionRegistry::EVERYTHING);
+    if (!extension)
+      return;

[stevenjb, 2015/05/26 21:26:25]

We should either move this check to service->UninstallExtension(), or add a
service->IsExtensionInstalled() rather than adding this extra dependency here.

[babu, 2015/06/04 14:48:11]

Thanks for reviewing! 

UninstallExtension() has the CHECK() failure already if the extension isn't
there.  Also, instead of adding a new method IsExtensionInstalled(), I found
that UninstallExtensionHelpr() does the same check before calling
UninstallExtension(). So, changed to UninstallExtensionHelpr() here. Hope it is
okay.

     service->UninstallExtension(id,
                                 extensions::UNINSTALL_REASON_SYNC,
                                 base::Bind(&base::DoNothing),
                                 NULL);
   }
 }
 
 bool GetAppListItemType(AppListItem* item,
                         sync_pb::AppListSpecifics::AppListItemType* type) {
   const char* item_type = item->GetItemType();
@@ skipping 861 matching lines @@
   } else {
     res += " { " + item_name + " }";
     res += " [" + item_ordinal.ToDebugString() + "]";
     if (!parent_id.empty())
       res += " <" + parent_id.substr(0, 8) + ">";
   }
   return res;
 }
 
 }  // namespace app_list