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

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

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/message_loop.h" 11 #include "base/message_loop.h"
11 #include "base/path_service.h" 12 #include "base/path_service.h"
12 #include "base/scoped_temp_dir.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/synchronization/waitable_event.h" 14 #include "base/synchronization/waitable_event.h"
15 #include "base/threading/sequenced_worker_pool.h" 15 #include "base/threading/sequenced_worker_pool.h"
16 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
17 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
18 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 18 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
20 #include "chrome/browser/chromeos/login/authenticator.h" 20 #include "chrome/browser/chromeos/login/authenticator.h"
21 #include "chrome/browser/chromeos/login/login_status_consumer.h" 21 #include "chrome/browser/chromeos/login/login_status_consumer.h"
22 #include "chrome/browser/chromeos/login/user_manager.h" 22 #include "chrome/browser/chromeos/login/user_manager.h"
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 input_method::MockInputMethodManager mock_input_method_manager_; 456 input_method::MockInputMethodManager mock_input_method_manager_;
457 net::TestURLFetcherFactory test_url_fetcher_factory_; 457 net::TestURLFetcherFactory test_url_fetcher_factory_;
458 458
459 cryptohome::MockAsyncMethodCaller* mock_async_method_caller_; 459 cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;
460 460
461 policy::BrowserPolicyConnector* connector_; 461 policy::BrowserPolicyConnector* connector_;
462 MockCryptohomeLibrary* cryptohome_; 462 MockCryptohomeLibrary* cryptohome_;
463 Profile* prepared_profile_; 463 Profile* prepared_profile_;
464 464
465 private: 465 private:
466 ScopedTempDir scoped_temp_dir_; 466 base::ScopedTempDir scoped_temp_dir_;
467 467
468 std::string device_policy_; 468 std::string device_policy_;
469 std::string user_policy_; 469 std::string user_policy_;
470 470
471 DISALLOW_COPY_AND_ASSIGN(LoginUtilsTest); 471 DISALLOW_COPY_AND_ASSIGN(LoginUtilsTest);
472 }; 472 };
473 473
474 class LoginUtilsBlockingLoginTest 474 class LoginUtilsBlockingLoginTest
475 : public LoginUtilsTest, 475 : public LoginUtilsTest,
476 public testing::WithParamInterface<int> {}; 476 public testing::WithParamInterface<int> {};
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 } 655 }
656 656
657 INSTANTIATE_TEST_CASE_P( 657 INSTANTIATE_TEST_CASE_P(
658 LoginUtilsBlockingLoginTestInstance, 658 LoginUtilsBlockingLoginTestInstance,
659 LoginUtilsBlockingLoginTest, 659 LoginUtilsBlockingLoginTest,
660 testing::Values(0, 1, 2, 3, 4, 5)); 660 testing::Values(0, 1, 2, 3, 4, 5));
661 661
662 } // namespace 662 } // namespace
663 663
664 } 664 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698