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

Side by Side Diff: chrome/browser/chromeos/login/proxy_auth_dialog_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 auth_dialog_waiter.Wait(); 112 auth_dialog_waiter.Wait();
113 113
114 ASSERT_TRUE(auth_dialog_waiter.login_handler()); 114 ASSERT_TRUE(auth_dialog_waiter.login_handler());
115 auth_dialog_waiter.login_handler()->CancelAuth(); 115 auth_dialog_waiter.login_handler()->CancelAuth();
116 } 116 }
117 117
118 { 118 {
119 OobeScreenWaiter screen_waiter(OobeScreen::SCREEN_GAIA_SIGNIN); 119 OobeScreenWaiter screen_waiter(OobeScreen::SCREEN_GAIA_SIGNIN);
120 ProxyAuthDialogWaiter auth_dialog_waiter; 120 ProxyAuthDialogWaiter auth_dialog_waiter;
121 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(), 121 ASSERT_TRUE(content::ExecuteScript(oobe_ui->web_ui()->GetWebContents(),
122 "window.domAutomationController.send(!!(" 122 "$('add-user-button').click()"));
123 "$('add-user-button').click()"
124 "));"));
125 screen_waiter.Wait(); 123 screen_waiter.Wait();
126 auth_dialog_waiter.Wait(); 124 auth_dialog_waiter.Wait();
127 ASSERT_TRUE(auth_dialog_waiter.login_handler()); 125 ASSERT_TRUE(auth_dialog_waiter.login_handler());
128 } 126 }
129 } 127 }
130 128
131 } // namespace chromeos 129 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chrome_site_per_process_browsertest.cc ('k') | chrome/browser/chromeos/login/saml/saml_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698