diff options
| author | treib <treib@chromium.org> | 2015-08-06 03:55:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-06 10:56:16 +0000 |
| commit | 926ee2dccf73a971e1f78e80d09231f8ba19aff3 (patch) | |
| tree | 6bfeb8e29cdddb7e765003e6265ef3aba5eb3621 /extensions/browser/app_window | |
| parent | cac01ee2465f98273202a67a1d1d95ccb381fa90 (diff) | |
| download | chromium_src-926ee2dccf73a971e1f78e80d09231f8ba19aff3.zip chromium_src-926ee2dccf73a971e1f78e80d09231f8ba19aff3.tar.gz chromium_src-926ee2dccf73a971e1f78e80d09231f8ba19aff3.tar.bz2 | |
Move ownership of AppSorting from ExtensionPrefs to ExtensionSystem
BUG=None
Review URL: https://codereview.chromium.org/1254363004
Cr-Commit-Position: refs/heads/master@{#342093}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window_geometry_cache_unittest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc index e1f4068..b35a543 100644 --- a/extensions/browser/app_window/app_window_geometry_cache_unittest.cc +++ b/extensions/browser/app_window/app_window_geometry_cache_unittest.cc @@ -17,7 +17,6 @@ #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" @@ -92,11 +91,9 @@ void AppWindowGeometryCacheTest::SetUp() { pref_service_ = factory.Create(pref_registry).Pass(); extension_prefs_.reset(ExtensionPrefs::Create( - pref_service_.get(), + browser_context(), pref_service_.get(), browser_context()->GetPath().AppendASCII("Extensions"), - extension_pref_value_map_.get(), - scoped_ptr<AppSorting>(new NullAppSorting), - false /* extensions_disabled */, + extension_pref_value_map_.get(), false /* extensions_disabled */, std::vector<ExtensionPrefsObserver*>())); cache_.reset( |