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

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

Issue 2478803003: Remove DOMAutomationController::automation_id_ (Closed)
Patch Set: Rebasing... Created 3 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
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 "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include "ash/accessibility_types.h" 7 #include "ash/accessibility_types.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 return; 268 return;
269 chromeos::OobeUI* oobe_ui = host->GetOobeUI(); 269 chromeos::OobeUI* oobe_ui = host->GetOobeUI();
270 if (!oobe_ui) 270 if (!oobe_ui)
271 return; 271 return;
272 base::RunLoop run_loop; 272 base::RunLoop run_loop;
273 const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop.QuitClosure()); 273 const bool oobe_ui_ready = oobe_ui->IsJSReady(run_loop.QuitClosure());
274 if (!oobe_ui_ready) 274 if (!oobe_ui_ready)
275 run_loop.Run(); 275 run_loop.Run();
276 } 276 }
277 277
278 bool JSExecute(const std::string& expression) { 278 bool JSExecute(const std::string& script) {
279 return content::ExecuteScript( 279 return content::ExecuteScript(GetWebContents(), script);
280 GetWebContents(),
281 "window.domAutomationController.send(!!(" + expression + "));");
282 } 280 }
283 281
284 bool JSExecuteBooleanExpression(const std::string& expression) { 282 bool JSExecuteBooleanExpression(const std::string& expression) {
285 bool result; 283 bool result;
286 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( 284 EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
287 GetWebContents(), 285 GetWebContents(),
288 "window.domAutomationController.send(!!(" + expression + "));", 286 "window.domAutomationController.send(!!(" + expression + "));",
289 &result)); 287 &result));
290 return result; 288 return result;
291 } 289 }
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 // http://crbug.com/651144 1344 // http://crbug.com/651144
1347 1345
1348 // TODO(fukino): Add tests for encryption migration UI. 1346 // TODO(fukino): Add tests for encryption migration UI.
1349 // http://crbug.com/706017 1347 // http://crbug.com/706017
1350 1348
1351 // TODO(updowndota): Add tests for Voice Interaction OptIn flow. 1349 // TODO(updowndota): Add tests for Voice Interaction OptIn flow.
1352 static_assert(static_cast<int>(ScreenExitCode::EXIT_CODES_COUNT) == 30, 1350 static_assert(static_cast<int>(ScreenExitCode::EXIT_CODES_COUNT) == 30,
1353 "tests for new control flow are missing"); 1351 "tests for new control flow are missing");
1354 1352
1355 } // namespace chromeos 1353 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/saml/saml_browsertest.cc ('k') | chrome/browser/extensions/browsertest_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698