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

Side by Side Diff: chrome/browser/chromeos/login/login_manager_test.h

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/chromeos/login/mock_login_utils.h" 10 #include "chrome/browser/chromeos/login/mock_login_utils.h"
(...skipping 12 matching lines...) Expand all
23 // If no special configuration is done launches out-of-box WebUI. 23 // If no special configuration is done launches out-of-box WebUI.
24 // To launch login UI use PRE_* test that will register user(s) and mark 24 // To launch login UI use PRE_* test that will register user(s) and mark
25 // out-of-box as completed. 25 // out-of-box as completed.
26 // Guarantees that WebUI has been initialized by waiting for 26 // Guarantees that WebUI has been initialized by waiting for
27 // NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE notification. 27 // NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE notification.
28 class LoginManagerTest : public InProcessBrowserTest { 28 class LoginManagerTest : public InProcessBrowserTest {
29 public: 29 public:
30 explicit LoginManagerTest(bool should_launch_browser); 30 explicit LoginManagerTest(bool should_launch_browser);
31 31
32 // Overriden from InProcessBrowserTest. 32 // Overriden from InProcessBrowserTest.
33 virtual void CleanUpOnMainThread() OVERRIDE; 33 virtual void TearDownOnMainThread() OVERRIDE;
34 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE; 34 virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
35 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE; 35 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
36 virtual void SetUpOnMainThread() OVERRIDE; 36 virtual void SetUpOnMainThread() OVERRIDE;
37 37
38 // Registers the user with the given |user_id| on the device. 38 // Registers the user with the given |user_id| on the device.
39 // This method should be called in PRE_* test. 39 // This method should be called in PRE_* test.
40 // TODO(dzhioev): Add the ability to register users without a PRE_* test. 40 // TODO(dzhioev): Add the ability to register users without a PRE_* test.
41 void RegisterUser(const std::string& user_id); 41 void RegisterUser(const std::string& user_id);
42 42
43 // Set expected credentials for next login attempt. 43 // Set expected credentials for next login attempt.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 bool should_launch_browser_; 78 bool should_launch_browser_;
79 content::WebContents* web_contents_; 79 content::WebContents* web_contents_;
80 test::JSChecker js_checker_; 80 test::JSChecker js_checker_;
81 81
82 DISALLOW_COPY_AND_ASSIGN(LoginManagerTest); 82 DISALLOW_COPY_AND_ASSIGN(LoginManagerTest);
83 }; 83 };
84 84
85 } // namespace chromeos 85 } // namespace chromeos
86 86
87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_ 87 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOGIN_MANAGER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/login/login_manager_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698