Cleanup: give ChromeAppSorting a BrowserContext

chrome/browser/extensions/chrome_app_sorting.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/extensions/chrome_app_sorting.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/extension_scoped_prefs.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/default_app_order.h"
 #endif
 
 namespace extensions {
 
 namespace {
@@ skipping 15 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ChromeAppSorting::AppOrdinals
 
 ChromeAppSorting::AppOrdinals::AppOrdinals() {}
 
 ChromeAppSorting::AppOrdinals::~AppOrdinals() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // ChromeAppSorting
 
-ChromeAppSorting::ChromeAppSorting()
+ChromeAppSorting::ChromeAppSorting(content::BrowserContext* browser_context)
     : extension_scoped_prefs_(NULL),
-      extension_sync_service_(NULL),
+      browser_context_(browser_context),
       default_ordinals_created_(false) {
 }
 
 ChromeAppSorting::~ChromeAppSorting() {
 }
 
 void ChromeAppSorting::SetExtensionScopedPrefs(ExtensionScopedPrefs* prefs) {
   extension_scoped_prefs_ = prefs;
 }
 
 void ChromeAppSorting::CheckExtensionScopedPrefs() const {
   CHECK(extension_scoped_prefs_);
 }
 
-void ChromeAppSorting::SetExtensionSyncService(
-    ExtensionSyncService* extension_sync_service) {
-  extension_sync_service_ = extension_sync_service;
-}
-
 void ChromeAppSorting::Initialize(
     const extensions::ExtensionIdList& extension_ids) {
   CHECK(extension_scoped_prefs_);
   InitializePageOrdinalMap(extension_ids);
 
   MigrateAppIndex(extension_ids);
 }
 
 void ChromeAppSorting::CreateOrdinalsIfNecessary(size_t minimum_size) {
   // Create StringOrdinal values as required to ensure |ntp_ordinal_map_| has at
@@ skipping 454 matching lines @@
            page_map->second.find(app_launch_ordinal);
        it != page_map->second.end(); ++it) {
     if (it->second == extension_id) {
       page_map->second.erase(it);
       break;
     }
   }
 }
 
 void ChromeAppSorting::SyncIfNeeded(const std::string& extension_id) {
-  if (extension_sync_service_)
-    extension_sync_service_->SyncOrderingChange(extension_id);
+  if (!browser_context_)

[not at google - send to devlin, 2015/07/23 15:35:11]

Comment // null for testing.

[Marc Treib, 2015/07/24 11:38:34]

Done.

+    return;
+
+  ExtensionService* service =
+      ExtensionSystem::Get(browser_context_)->extension_service();
+  const Extension* extension = service->GetInstalledExtension(extension_id);

[not at google - send to devlin, 2015/07/23 15:35:11]

Better:

ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context);
const Extension* extension = registry->GetInstalledExtension(extension_id);

[Marc Treib, 2015/07/24 11:38:34]

Done.

+  if (extension) {
+    Profile* profile = Profile::FromBrowserContext(browser_context_);
+    ExtensionSyncService::Get(profile)->SyncExtensionChangeIfNeeded(*extension);
+  }
 }
 
 void ChromeAppSorting::CreateDefaultOrdinals() {
   if (default_ordinals_created_)
     return;
   default_ordinals_created_ = true;
 
   // The following defines the default order of apps.
 #if defined(OS_CHROMEOS)
   std::vector<std::string> app_ids;
@@ skipping 69 matching lines @@
   for (AppLaunchOrdinalMap::const_iterator it = m.begin(); it != m.end();
        ++it) {
     const std::string& id = it->second;
     if (ntp_hidden_extensions_.count(id) == 0)
       result++;
   }
   return result;
 }
 
 }  // namespace extensions