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

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 15649018: Call crypto::InitializeTPMToken on the IO thread (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 7 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 | 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/login/login_utils.h" 5 #include "chrome/browser/chromeos/login/login_utils.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 test_user_manager_.reset(new ScopedTestUserManager); 274 test_user_manager_.reset(new ScopedTestUserManager);
275 275
276 browser_process_->SetProfileManager( 276 browser_process_->SetProfileManager(
277 new ProfileManagerWithoutInit(scoped_temp_dir_.path())); 277 new ProfileManagerWithoutInit(scoped_temp_dir_.path()));
278 connector_ = browser_process_->browser_policy_connector(); 278 connector_ = browser_process_->browser_policy_connector();
279 connector_->Init(local_state_.Get(), 279 connector_->Init(local_state_.Get(),
280 browser_process_->system_request_context()); 280 browser_process_->system_request_context());
281 281
282 // IOThread creates ProxyConfigServiceImpl which in turn needs 282 // IOThread creates ProxyConfigServiceImpl which in turn needs
283 // NetworkHandler. Thus initialize it here before creating IOThread. 283 // NetworkHandler. Thus initialize it here before creating IOThread.
284 NetworkHandler::Initialize(); 284 NetworkHandler::InitializeForTest();
285 285
286 io_thread_state_.reset(new IOThread(local_state_.Get(), 286 io_thread_state_.reset(new IOThread(local_state_.Get(),
287 browser_process_->policy_service(), 287 browser_process_->policy_service(),
288 NULL, NULL)); 288 NULL, NULL));
289 browser_process_->SetIOThread(io_thread_state_.get()); 289 browser_process_->SetIOThread(io_thread_state_.get());
290 290
291 #if defined(ENABLE_RLZ) 291 #if defined(ENABLE_RLZ)
292 rlz_initialized_cb_ = base::Bind(&base::DoNothing); 292 rlz_initialized_cb_ = base::Bind(&base::DoNothing);
293 rlz_lib::testing::SetRlzStoreDirectory(scoped_temp_dir_.path()); 293 rlz_lib::testing::SetRlzStoreDirectory(scoped_temp_dir_.path());
294 RLZTracker::EnableZeroDelayForTesting(); 294 RLZTracker::EnableZeroDelayForTesting();
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 } 726 }
727 727
728 INSTANTIATE_TEST_CASE_P( 728 INSTANTIATE_TEST_CASE_P(
729 LoginUtilsBlockingLoginTestInstance, 729 LoginUtilsBlockingLoginTestInstance,
730 LoginUtilsBlockingLoginTest, 730 LoginUtilsBlockingLoginTest,
731 testing::Values(0, 1, 2, 3, 4, 5)); 731 testing::Values(0, 1, 2, 3, 4, 5));
732 732
733 } // namespace 733 } // namespace
734 734
735 } 735 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698