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

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

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/wm/cursor_manager.h" 6 #include "ash/wm/cursor_manager.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
9 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 9 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
10 #include "chrome/browser/chromeos/cros/mock_network_library.h" 10 #include "chrome/browser/chromeos/cros/mock_network_library.h"
(...skipping 29 matching lines...) Expand all
40 cros_mock_->SetStatusAreaMocksExpectations(); 40 cros_mock_->SetStatusAreaMocksExpectations();
41 cros_mock_->InitMockCryptohomeLibrary(); 41 cros_mock_->InitMockCryptohomeLibrary();
42 mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library(); 42 mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library();
43 mock_network_library_ = cros_mock_->mock_network_library(); 43 mock_network_library_ = cros_mock_->mock_network_library();
44 EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt()) 44 EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt())
45 .WillRepeatedly(Return(std::string("stub_system_salt"))); 45 .WillRepeatedly(Return(std::string("stub_system_salt")));
46 EXPECT_CALL(*mock_cryptohome_library_, InstallAttributesIsReady()) 46 EXPECT_CALL(*mock_cryptohome_library_, InstallAttributesIsReady())
47 .WillRepeatedly(Return(false)); 47 .WillRepeatedly(Return(false));
48 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) 48 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
49 .Times(AnyNumber()); 49 .Times(AnyNumber());
50 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _, _)) 50 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _))
51 .WillRepeatedly(Return(true)); 51 .WillRepeatedly(Return(true));
52 } 52 }
53 53
54 MockCryptohomeLibrary* mock_cryptohome_library_; 54 MockCryptohomeLibrary* mock_cryptohome_library_;
55 MockNetworkLibrary* mock_network_library_; 55 MockNetworkLibrary* mock_network_library_;
56 56
57 private: 57 private:
58 DISALLOW_COPY_AND_ASSIGN(LoginTestBase); 58 DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
59 }; 59 };
60 60
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 // Cursor should be shown after cursor is moved. 127 // Cursor should be shown after cursor is moved.
128 EXPECT_TRUE(ui_test_utils::SendMouseMoveSync(gfx::Point())); 128 EXPECT_TRUE(ui_test_utils::SendMouseMoveSync(gfx::Point()));
129 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible()); 129 EXPECT_TRUE(ash::Shell::GetInstance()->cursor_manager()->IsCursorVisible());
130 130
131 MessageLoop::current()->DeleteSoon(FROM_HERE, 131 MessageLoop::current()->DeleteSoon(FROM_HERE,
132 BaseLoginDisplayHost::default_host()); 132 BaseLoginDisplayHost::default_host());
133 } 133 }
134 134
135 } // namespace chromeos 135 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698