chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc - Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file

Side by Side Diff: chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc

Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge conflict Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/extensions/extension_error_controller_unittest.cc ('k') | chrome/browser/extensions/extension_garbage_collector_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/file_util.h"	5 #include "base/file_util.h"

6 #include "base/prefs/scoped_user_pref_update.h"	6 #include "base/prefs/scoped_user_pref_update.h"

7 #include "base/prefs/testing_pref_service.h"	7 #include "base/prefs/testing_pref_service.h"

8 #include "base/strings/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "base/threading/sequenced_worker_pool.h"	9 #include "base/threading/sequenced_worker_pool.h"

10 #include "base/values.h"	10 #include "base/values.h"

11 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"	11 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"

12 #include "chrome/browser/chromeos/login/users/user_manager.h"	12 #include "chrome/browser/chromeos/login/users/user_manager.h"

13 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"	13 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"

14 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"	14 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"

15 #include "chrome/browser/extensions/extension_service_unittest.h"	15 #include "chrome/browser/extensions/extension_service.h"

	16 #include "chrome/browser/extensions/extension_service_test_base.h"

16 #include "chrome/browser/prefs/browser_prefs.h"	17 #include "chrome/browser/prefs/browser_prefs.h"

17 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

18 #include "chrome/test/base/testing_browser_process.h"	19 #include "chrome/test/base/testing_browser_process.h"

19 #include "chrome/test/base/testing_profile.h"	20 #include "chrome/test/base/testing_profile.h"

20 #include "content/public/browser/browser_thread.h"	21 #include "content/public/browser/browser_thread.h"

21 #include "content/public/browser/plugin_service.h"	22 #include "content/public/browser/plugin_service.h"

22 #include "extensions/browser/extension_prefs.h"	23 #include "extensions/browser/extension_prefs.h"

23 #include "extensions/common/manifest_constants.h"	24 #include "extensions/common/manifest_constants.h"

24	25

25 namespace {	26 namespace {

(...skipping 161 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
187	188

188 const base::DictionaryValue* shared_extensions = local_state().GetDictionary(	189 const base::DictionaryValue* shared_extensions = local_state().GetDictionary(

189 ExtensionAssetsManagerChromeOS::kSharedExtensions);	190 ExtensionAssetsManagerChromeOS::kSharedExtensions);

190 ASSERT_TRUE(shared_extensions);	191 ASSERT_TRUE(shared_extensions);

191	192

192 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));	193 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));

193 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));	194 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));

194 }	195 }

195	196

196 } // namespace extensions	197 } // namespace extensions

OLD	NEW