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

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

Issue 423713006: Revert of Loading screenshots and simple 1-to-1 comparison of screenshots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screenshot_tester.h » ('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 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 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/prefs/pref_service.h" 6 #include "base/prefs/pref_service.h"
7 #include "base/timer/timer.h" 7 #include "base/timer/timer.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/chromeos/login/login_manager_test.h" 10 #include "chrome/browser/chromeos/login/login_manager_test.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 class LoginUITest : public chromeos::LoginManagerTest { 142 class LoginUITest : public chromeos::LoginManagerTest {
143 public: 143 public:
144 bool enable_test_screenshots_; 144 bool enable_test_screenshots_;
145 LoginUITest() : LoginManagerTest(false) {} 145 LoginUITest() : LoginManagerTest(false) {}
146 virtual ~LoginUITest() {} 146 virtual ~LoginUITest() {}
147 virtual void SetUpOnMainThread() OVERRIDE { 147 virtual void SetUpOnMainThread() OVERRIDE {
148 enable_test_screenshots_ = screenshot_tester.TryInitialize(); 148 enable_test_screenshots_ = screenshot_tester.TryInitialize();
149 if (enable_test_screenshots_) { 149 if (enable_test_screenshots_) {
150 animation_delay_handler.Initialize(); 150 animation_delay_handler.Initialize();
151 } else {
152 LOG(WARNING) << "Screenshots will not be taken";
151 } 153 }
152 LoginManagerTest::SetUpOnMainThread(); 154 LoginManagerTest::SetUpOnMainThread();
153 } 155 }
154 156
155 protected: 157 protected:
156 AnimationDelayHandler animation_delay_handler; 158 AnimationDelayHandler animation_delay_handler;
157 ScreenshotTester screenshot_tester; 159 ScreenshotTester screenshot_tester;
158 }; 160 };
159 161
160 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) { 162 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_LoginUIVisible) {
(...skipping 25 matching lines...) Expand all
186 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true); 188 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
187 } 189 }
188 190
189 // Tests that the default first screen is the network screen after OOBE 191 // Tests that the default first screen is the network screen after OOBE
190 // when auto enrollment is enabled and device is not yet enrolled. 192 // when auto enrollment is enabled and device is not yet enrolled.
191 IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) { 193 IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) {
192 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait(); 194 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait();
193 } 195 }
194 196
195 } // namespace chromeos 197 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screenshot_tester.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698