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

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

Issue 14192017: Extract certificate policy application from NetworkLibrary. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 7 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/chrome_browser_main.h" 7 #include "chrome/browser/chrome_browser_main.h"
8 #include "chrome/browser/chrome_browser_main_extra_parts.h" 8 #include "chrome/browser/chrome_browser_main_extra_parts.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 10 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary()); 47 mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary());
48 cros_mock_->InitStatusAreaMocks(); 48 cros_mock_->InitStatusAreaMocks();
49 cros_mock_->SetStatusAreaMocksExpectations(); 49 cros_mock_->SetStatusAreaMocksExpectations();
50 mock_network_library_ = cros_mock_->mock_network_library(); 50 mock_network_library_ = cros_mock_->mock_network_library();
51 EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt()) 51 EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt())
52 .WillRepeatedly(Return(std::string("stub_system_salt"))); 52 .WillRepeatedly(Return(std::string("stub_system_salt")));
53 EXPECT_CALL(*(mock_cryptohome_library_.get()), InstallAttributesIsReady()) 53 EXPECT_CALL(*(mock_cryptohome_library_.get()), InstallAttributesIsReady())
54 .WillRepeatedly(Return(false)); 54 .WillRepeatedly(Return(false));
55 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) 55 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_))
56 .Times(AnyNumber()); 56 .Times(AnyNumber());
57 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _, _, _)) 57 EXPECT_CALL(*mock_network_library_, LoadOncNetworks(_, _))
58 .WillRepeatedly(Return(true)); 58 .Times(AnyNumber());
59 } 59 }
60 60
61 scoped_ptr<chromeos::MockCryptohomeLibrary> mock_cryptohome_library_; 61 scoped_ptr<chromeos::MockCryptohomeLibrary> mock_cryptohome_library_;
62 chromeos::MockNetworkLibrary* mock_network_library_; 62 chromeos::MockNetworkLibrary* mock_network_library_;
63 63
64 private: 64 private:
65 DISALLOW_COPY_AND_ASSIGN(LoginTestBase); 65 DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
66 }; 66 };
67 67
68 class LoginUserTest : public LoginTestBase { 68 class LoginUserTest : public LoginTestBase {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // Verifies that the webui for login comes up successfully. 217 // Verifies that the webui for login comes up successfully.
218 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) { 218 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
219 scoped_refptr<content::MessageLoopRunner> runner = 219 scoped_refptr<content::MessageLoopRunner> runner =
220 new content::MessageLoopRunner; 220 new content::MessageLoopRunner;
221 content_browser_client_->browser_main_extra_parts_->set_quit_task( 221 content_browser_client_->browser_main_extra_parts_->set_quit_task(
222 runner->QuitClosure()); 222 runner->QuitClosure());
223 runner->Run(); 223 runner->Run();
224 } 224 }
225 225
226 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698