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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/chrome_notification_types.h" 6 #include "chrome/browser/chrome_notification_types.h"
7 #include "chrome/browser/chromeos/login/existing_user_controller.h" 7 #include "chrome/browser/chromeos/login/existing_user_controller.h"
8 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 8 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
9 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 9 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
10 #include "chrome/browser/chromeos/login/ui/webui_login_display.h" 10 #include "chrome/browser/chromeos/login/ui/webui_login_display.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual void SetUpOnMainThread() OVERRIDE { 44 virtual void SetUpOnMainThread() OVERRIDE {
45 CHECK(embedded_test_server()->InitializeAndWaitUntilReady()); 45 CHECK(embedded_test_server()->InitializeAndWaitUntilReady());
46 embedded_test_server()->RegisterRequestHandler( 46 embedded_test_server()->RegisterRequestHandler(
47 base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_))); 47 base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_)));
48 LOG(INFO) << "Set up http server at " << embedded_test_server()->base_url(); 48 LOG(INFO) << "Set up http server at " << embedded_test_server()->base_url();
49 49
50 CommandLine::ForCurrentProcess()->AppendSwitchASCII( 50 CommandLine::ForCurrentProcess()->AppendSwitchASCII(
51 ::switches::kGaiaUrl, embedded_test_server()->base_url().spec()); 51 ::switches::kGaiaUrl, embedded_test_server()->base_url().spec());
52 } 52 }
53 53
54 virtual void CleanUpOnMainThread() OVERRIDE { 54 virtual void TearDownOnMainThread() OVERRIDE {
55 // If the login display is still showing, exit gracefully. 55 // If the login display is still showing, exit gracefully.
56 if (LoginDisplayHostImpl::default_host()) { 56 if (LoginDisplayHostImpl::default_host()) {
57 base::MessageLoop::current()->PostTask(FROM_HERE, 57 base::MessageLoop::current()->PostTask(FROM_HERE,
58 base::Bind(&chrome::AttemptExit)); 58 base::Bind(&chrome::AttemptExit));
59 content::RunMessageLoop(); 59 content::RunMessageLoop();
60 } 60 }
61 } 61 }
62 62
63 chromeos::WebUILoginDisplay* GetLoginDisplay() { 63 chromeos::WebUILoginDisplay* GetLoginDisplay() {
64 chromeos::ExistingUserController* controller = 64 chromeos::ExistingUserController* controller =
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 ui_controls::SendKeyPress(login_window, 115 ui_controls::SendKeyPress(login_window,
116 ui::VKEY_E, 116 ui::VKEY_E,
117 true, // control 117 true, // control
118 false, // shift 118 false, // shift
119 true, // alt 119 true, // alt
120 false); // command 120 false); // command
121 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait(); 121 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait();
122 } 122 }
123 123
124 } // namespace chromeos 124 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698