Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

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

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fixed. Created 5 years, 10 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
OLDNEW
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 "chrome/browser/extensions/extension_garbage_collector_chromeos.h" 5 #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/prefs/scoped_user_pref_update.h" 11 #include "base/prefs/scoped_user_pref_update.h"
12 #include "base/prefs/testing_pref_service.h" 12 #include "base/prefs/testing_pref_service.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/threading/sequenced_worker_pool.h" 14 #include "base/threading/sequenced_worker_pool.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 16 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 17 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
18 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
19 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" 19 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
20 #include "chrome/browser/extensions/extension_service.h" 20 #include "chrome/browser/extensions/extension_service.h"
21 #include "chrome/browser/extensions/extension_service_test_base.h" 21 #include "chrome/browser/extensions/extension_service_test_base.h"
22 #include "chrome/browser/prefs/browser_prefs.h" 22 #include "chrome/browser/prefs/browser_prefs.h"
23 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/test/base/testing_browser_process.h" 24 #include "chrome/test/base/testing_browser_process.h"
25 #include "chrome/test/base/testing_profile.h" 25 #include "chrome/test/base/testing_profile.h"
26 #include "chromeos/login/user_names.h" 26 #include "chromeos/login/user_names.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 content::BrowserThread::GetBlockingPool() 59 content::BrowserThread::GetBlockingPool()
60 ->GetSequencedTaskRunnerWithShutdownBehavior( 60 ->GetSequencedTaskRunnerWithShutdownBehavior(
61 content::BrowserThread::GetBlockingPool() 61 content::BrowserThread::GetBlockingPool()
62 ->GetNamedSequenceToken("ext_install-"), 62 ->GetNamedSequenceToken("ext_install-"),
63 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); 63 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
64 64
65 CHECK(cache_dir_.CreateUniqueTempDir()); 65 CHECK(cache_dir_.CreateUniqueTempDir());
66 ExtensionAssetsManagerChromeOS::SetSharedInstallDirForTesting(cache_dir()); 66 ExtensionAssetsManagerChromeOS::SetSharedInstallDirForTesting(cache_dir());
67 ExtensionGarbageCollectorChromeOS::ClearGarbageCollectedForTesting(); 67 ExtensionGarbageCollectorChromeOS::ClearGarbageCollectedForTesting();
68 68
69 // Initialize the UserManager singleton to a fresh FakeUserManager instance. 69 // Initialize the UserManager singleton to a fresh FakeChromeUserManager
70 user_manager_enabler_.reset( 70 // instance.
71 new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager)); 71 user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
72 new chromeos::FakeChromeUserManager));
72 73
73 GetFakeUserManager()->AddUser(chromeos::login::kStubUser); 74 GetFakeUserManager()->AddUser(chromeos::login::kStubUser);
74 GetFakeUserManager()->LoginUser(chromeos::login::kStubUser); 75 GetFakeUserManager()->LoginUser(chromeos::login::kStubUser);
75 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting( 76 chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(
76 GetFakeUserManager()->GetActiveUser(), profile_.get()); 77 GetFakeUserManager()->GetActiveUser(), profile_.get());
77 } 78 }
78 79
79 void TearDown() override { 80 void TearDown() override {
80 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); 81 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
81 } 82 }
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 CHECK(extension.get()) << error; 138 CHECK(extension.get()) << error;
138 CHECK_EQ(id, extension->id()); 139 CHECK_EQ(id, extension->id());
139 140
140 return extension; 141 return extension;
141 } 142 }
142 143
143 ExtensionPrefs* GetExtensionPrefs() { 144 ExtensionPrefs* GetExtensionPrefs() {
144 return ExtensionPrefs::Get(profile_.get()); 145 return ExtensionPrefs::Get(profile_.get());
145 } 146 }
146 147
147 chromeos::FakeUserManager* GetFakeUserManager() { 148 chromeos::FakeChromeUserManager* GetFakeUserManager() {
148 return static_cast<chromeos::FakeUserManager*>( 149 return static_cast<chromeos::FakeChromeUserManager*>(
149 user_manager::UserManager::Get()); 150 user_manager::UserManager::Get());
150 } 151 }
151 152
152 private: 153 private:
153 scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_; 154 scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
154 TestingPrefServiceSimple local_state_; 155 TestingPrefServiceSimple local_state_;
155 base::ScopedTempDir cache_dir_; 156 base::ScopedTempDir cache_dir_;
156 }; 157 };
157 158
158 // Test shared extensions clean up. 159 // Test shared extensions clean up.
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 197
197 const base::DictionaryValue* shared_extensions = local_state().GetDictionary( 198 const base::DictionaryValue* shared_extensions = local_state().GetDictionary(
198 ExtensionAssetsManagerChromeOS::kSharedExtensions); 199 ExtensionAssetsManagerChromeOS::kSharedExtensions);
199 ASSERT_TRUE(shared_extensions); 200 ASSERT_TRUE(shared_extensions);
200 201
201 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1)); 202 EXPECT_FALSE(shared_extensions->HasKey(kExtensionId1));
202 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2)); 203 EXPECT_TRUE(shared_extensions->HasKey(kExtensionId2));
203 } 204 }
204 205
205 } // namespace extensions 206 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698