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

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

Issue 1179323005: Polymer upgraded to 1.0 in login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@polymer_pre_migration
Patch Set: Comments addressed. Created 5 years, 6 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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "ash/system/tray/system_tray.h" 6 #include "ash/system/tray/system_tray.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 "#passwordInput')"; 164 "#passwordInput')";
165 const std::string password_next_button = 165 const std::string password_next_button =
166 "document.querySelector('#offline-gaia /deep/ #passwordSection" 166 "document.querySelector('#offline-gaia /deep/ #passwordSection"
167 " /deep/ #button')"; 167 " /deep/ #button')";
168 168
169 content::DOMMessageQueue message_queue; 169 content::DOMMessageQueue message_queue;
170 JSExpect("!document.querySelector('#offline-gaia').hidden"); 170 JSExpect("!document.querySelector('#offline-gaia').hidden");
171 JSExpect("document.querySelector('#signin-frame').hidden"); 171 JSExpect("document.querySelector('#signin-frame').hidden");
172 const std::string js = 172 const std::string js =
173 animated_pages + 173 animated_pages +
174 ".addEventListener('core-animated-pages-transition-end'," 174 ".addEventListener('neon-animation-finish',"
175 "function() {" 175 "function() {"
176 "window.domAutomationController.setAutomationId(0);" 176 "window.domAutomationController.setAutomationId(0);"
177 "window.domAutomationController.send('switchToPassword');" 177 "window.domAutomationController.send('switchToPassword');"
178 "})"; 178 "})";
179 ASSERT_TRUE(content::ExecuteScript(web_contents(), js)); 179 ASSERT_TRUE(content::ExecuteScript(web_contents(), js));
180 std::string set_email = email_input + ".value = '$Email'"; 180 std::string set_email = email_input + ".value = '$Email'";
181 ReplaceSubstringsAfterOffset(&set_email, 0, "$Email", user_email); 181 ReplaceSubstringsAfterOffset(&set_email, 0, "$Email", user_email);
182 ASSERT_TRUE(content::ExecuteScript(web_contents(), set_email)); 182 ASSERT_TRUE(content::ExecuteScript(web_contents(), set_email));
183 ASSERT_TRUE(content::ExecuteScript(web_contents(), 183 ASSERT_TRUE(content::ExecuteScript(web_contents(),
184 email_next_button + ".fire('tap')")); 184 email_next_button + ".fire('tap')"));
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 content::WindowedNotificationObserver session_start_waiter( 338 content::WindowedNotificationObserver session_start_waiter(
339 chrome::NOTIFICATION_SESSION_STARTED, 339 chrome::NOTIFICATION_SESSION_STARTED,
340 content::NotificationService::AllSources()); 340 content::NotificationService::AllSources());
341 SubmitGaiaAuthOfflineForm(kTestUser, kPassword); 341 SubmitGaiaAuthOfflineForm(kTestUser, kPassword);
342 session_start_waiter.Wait(); 342 session_start_waiter.Wait();
343 343
344 TestSystemTrayIsVisible(); 344 TestSystemTrayIsVisible();
345 } 345 }
346 346
347 } // namespace 347 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698