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

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

Issue 24869003: cryptohome: Move stateless wrapper functions out of CryptohomeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 7 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 26 matching lines...) Expand all
37 public: 37 public:
38 LoginTestBase() {} 38 LoginTestBase() {}
39 39
40 protected: 40 protected:
41 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 41 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
42 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); 42 InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
43 43
44 mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary()); 44 mock_cryptohome_library_.reset(new chromeos::MockCryptohomeLibrary());
45 EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt()) 45 EXPECT_CALL(*(mock_cryptohome_library_.get()), GetSystemSalt())
46 .WillRepeatedly(Return(std::string("stub_system_salt"))); 46 .WillRepeatedly(Return(std::string("stub_system_salt")));
47 EXPECT_CALL(*(mock_cryptohome_library_.get()), InstallAttributesIsReady())
48 .WillRepeatedly(Return(false));
49 } 47 }
50 48
51 scoped_ptr<chromeos::MockCryptohomeLibrary> mock_cryptohome_library_; 49 scoped_ptr<chromeos::MockCryptohomeLibrary> mock_cryptohome_library_;
52 50
53 private: 51 private:
54 DISALLOW_COPY_AND_ASSIGN(LoginTestBase); 52 DISALLOW_COPY_AND_ASSIGN(LoginTestBase);
55 }; 53 };
56 54
57 class LoginUserTest : public LoginTestBase { 55 class LoginUserTest : public LoginTestBase {
58 protected: 56 protected:
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // Verifies that the webui for login comes up successfully. 201 // Verifies that the webui for login comes up successfully.
204 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) { 202 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
205 scoped_refptr<content::MessageLoopRunner> runner = 203 scoped_refptr<content::MessageLoopRunner> runner =
206 new content::MessageLoopRunner; 204 new content::MessageLoopRunner;
207 content_browser_client_->browser_main_extra_parts_->set_quit_task( 205 content_browser_client_->browser_main_extra_parts_->set_quit_task(
208 runner->QuitClosure()); 206 runner->QuitClosure());
209 runner->Run(); 207 runner->Run();
210 } 208 }
211 209
212 } // namespace 210 } // namespace
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698