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

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

Issue 66713002: Get rid of {Enable|Disable|ChromeCaptivePortalDetector flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restored blank line. Created 7 years, 1 month 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/login_display_host_impl.h" 8 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
10 #include "chrome/browser/chromeos/login/webui_login_display.h" 10 #include "chrome/browser/chromeos/login/webui_login_display.h"
(...skipping 16 matching lines...) Expand all
27 namespace chromeos { 27 namespace chromeos {
28 28
29 class OobeTest : public InProcessBrowserTest { 29 class OobeTest : public InProcessBrowserTest {
30 public: 30 public:
31 OobeTest() {} 31 OobeTest() {}
32 virtual ~OobeTest() {} 32 virtual ~OobeTest() {}
33 33
34 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 34 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
35 command_line->AppendSwitch(chromeos::switches::kLoginManager); 35 command_line->AppendSwitch(chromeos::switches::kLoginManager);
36 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 36 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
37 command_line->AppendSwitch(
38 chromeos::switches::kDisableChromeCaptivePortalDetector);
39 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 37 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
40 command_line->AppendSwitchASCII( 38 command_line->AppendSwitchASCII(
41 chromeos::switches::kAuthExtensionPath, "gaia_auth"); 39 chromeos::switches::kAuthExtensionPath, "gaia_auth");
42 } 40 }
43 41
44 virtual void SetUpOnMainThread() OVERRIDE { 42 virtual void SetUpOnMainThread() OVERRIDE {
45 CHECK(embedded_test_server()->InitializeAndWaitUntilReady()); 43 CHECK(embedded_test_server()->InitializeAndWaitUntilReady());
46 embedded_test_server()->RegisterRequestHandler( 44 embedded_test_server()->RegisterRequestHandler(
47 base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_))); 45 base::Bind(&FakeGaia::HandleRequest, base::Unretained(&fake_gaia_)));
48 LOG(INFO) << "Set up http server at " << embedded_test_server()->base_url(); 46 LOG(INFO) << "Set up http server at " << embedded_test_server()->base_url();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 ui_controls::SendKeyPress(login_window, 113 ui_controls::SendKeyPress(login_window,
116 ui::VKEY_E, 114 ui::VKEY_E,
117 true, // control 115 true, // control
118 false, // shift 116 false, // shift
119 true, // alt 117 true, // alt
120 false); // command 118 false); // command
121 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait(); 119 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait();
122 } 120 }
123 121
124 } // namespace chromeos 122 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/kiosk_browsertest.cc ('k') | chrome/browser/chromeos/net/network_portal_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698