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

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

Issue 10817007: Remove chromeos::CryptohomeLibrary::IsMounted and convert (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/time.h" 6 #include "base/time.h"
7 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 7 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
8 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 8 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
9 #include "chrome/browser/chromeos/cros/mock_network_library.h" 9 #include "chrome/browser/chromeos/cros/mock_network_library.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 17 matching lines...) Expand all
28 mock_network_library_(NULL) { 28 mock_network_library_(NULL) {
29 } 29 }
30 30
31 protected: 31 protected:
32 virtual void SetUpInProcessBrowserTestFixture() { 32 virtual void SetUpInProcessBrowserTestFixture() {
33 cros_mock_->InitStatusAreaMocks(); 33 cros_mock_->InitStatusAreaMocks();
34 cros_mock_->SetStatusAreaMocksExpectations(); 34 cros_mock_->SetStatusAreaMocksExpectations();
35 cros_mock_->InitMockCryptohomeLibrary(); 35 cros_mock_->InitMockCryptohomeLibrary();
36 mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library(); 36 mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library();
37 mock_network_library_ = cros_mock_->mock_network_library(); 37 mock_network_library_ = cros_mock_->mock_network_library();
38 EXPECT_CALL(*mock_cryptohome_library_, IsMounted())
39 .WillRepeatedly(Return(true));
40 EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt()) 38 EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
41 .WillRepeatedly(Return(std::string("stub_system_salt"))); 39 .WillRepeatedly(Return(std::string("stub_system_salt")));
42 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) 40 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
43 .Times(AnyNumber()); 41 .Times(AnyNumber());
44 } 42 }
45 43
46 MockCryptohomeLibrary* mock_cryptohome_library_; 44 MockCryptohomeLibrary* mock_cryptohome_library_;
47 MockNetworkLibrary* mock_network_library_; 45 MockNetworkLibrary* mock_network_library_;
48 46
49 private: 47 private:
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // After a guest login, we should get the OTR default profile. 83 // After a guest login, we should get the OTR default profile.
86 IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) { 84 IN_PROC_BROWSER_TEST_F(LoginGuestTest, GuestIsOTR) {
87 Profile* profile = browser()->profile(); 85 Profile* profile = browser()->profile();
88 EXPECT_EQ("Default", profile->GetPath().BaseName().value()); 86 EXPECT_EQ("Default", profile->GetPath().BaseName().value());
89 EXPECT_TRUE(profile->IsOffTheRecord()); 87 EXPECT_TRUE(profile->IsOffTheRecord());
90 // Ensure there's extension service for this profile. 88 // Ensure there's extension service for this profile.
91 EXPECT_TRUE(profile->GetExtensionService()); 89 EXPECT_TRUE(profile->GetExtensionService());
92 } 90 }
93 91
94 } // namespace chromeos 92 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698