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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_test_helper.cc

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added Linux implementation. Created 6 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/settings/device_settings_test_helper.h" 5 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "chrome/browser/chromeos/ownership/owner_settings_service.h" 10 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 user = user_manager_->AddUser(user_id); 256 user = user_manager_->AddUser(user_id);
257 profile_->set_profile_name(user_id); 257 profile_->set_profile_name(user_id);
258 258
259 ProfileHelper::Get()->SetUserToProfileMappingForTesting(user, 259 ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
260 profile_.get()); 260 profile_.get());
261 } 261 }
262 OwnerSettingsService* service = 262 OwnerSettingsService* service =
263 OwnerSettingsServiceFactory::GetForProfile(profile_.get()); 263 OwnerSettingsServiceFactory::GetForProfile(profile_.get());
264 CHECK(service); 264 CHECK(service);
265 if (tpm_is_ready) 265 if (tpm_is_ready)
266 service->OnTPMTokenReady(); 266 service->OnTPMTokenReady(true /* token is enabled */);
267 } 267 }
268 268
269 } // namespace chromeos 269 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698