Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem

extensions/browser/app_window/app_window_geometry_cache_unittest.cc

 // Copyright 2014 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 "extensions/browser/app_window/app_window_geometry_cache.h"
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/mock_pref_change_callback.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extensions_test.h"
-#include "extensions/browser/null_app_sorting.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace extensions {
 
 namespace {
 const char kWindowId[] = "windowid";
@@ skipping 54 matching lines @@
   base::PrefServiceFactory factory;
   factory.set_user_prefs(new TestingPrefStore);
   factory.set_extension_prefs(new TestingPrefStore);
   user_prefs::PrefRegistrySyncable* pref_registry =
       new user_prefs::PrefRegistrySyncable;
   // Prefs should be registered before the PrefService is created.
   ExtensionPrefs::RegisterProfilePrefs(pref_registry);
   pref_service_ = factory.Create(pref_registry).Pass();
 
   extension_prefs_.reset(ExtensionPrefs::Create(
+      nullptr,

[not at google - send to devlin, 2015/08/03 21:12:08]

This seems to be the only case where ExtensionPrefs is created with a null
BrowserContext; and why does it need to be? You already have access to a
browser_context(), is there a reason you can't pass that through? If you do that
you can get rid of the null checks and the comments explaining the null
checks...

[Marc Treib, 2015/08/04 08:36:28]

D'oh, somehow I didn't see the |browser_context()| call right below here.
Passing it through now, and removed the null checks.

       pref_service_.get(),
       browser_context()->GetPath().AppendASCII("Extensions"),
       extension_pref_value_map_.get(),
-      scoped_ptr<AppSorting>(new NullAppSorting),
       false /* extensions_disabled */,
       std::vector<ExtensionPrefsObserver*>()));
 
   cache_.reset(
       new AppWindowGeometryCache(browser_context(), extension_prefs_.get()));
   cache_->SetSyncDelayForTests(0);
 }
 
 void AppWindowGeometryCacheTest::TearDown() {
   cache_.reset();
@@ skipping 312 matching lines @@
   // The first added window should no longer have cached geometry.
   EXPECT_FALSE(cache_->GetGeometry(extension_id, "window_0", NULL, NULL, NULL));
   // All other windows should still exist.
   for (size_t i = 1; i < AppWindowGeometryCache::kMaxCachedWindows + 1; ++i) {
     std::string window_id = "window_" + base::IntToString(i);
     EXPECT_TRUE(cache_->GetGeometry(extension_id, window_id, NULL, NULL, NULL));
   }
 }
 
 }  // namespace extensions