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

Side by Side Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 952353002: Requiem for client_screen.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 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 "chrome/test/remoting/remote_desktop_browsertest.h" 5 #include "chrome/test/remoting/remote_desktop_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 EXPECT_TRUE(HtmlElementVisible("me2me-content")); 380 EXPECT_TRUE(HtmlElementVisible("me2me-content"));
381 EXPECT_FALSE(HtmlElementVisible("me2me-first-run")); 381 EXPECT_FALSE(HtmlElementVisible("me2me-first-run"));
382 } 382 }
383 383
384 void RemoteDesktopBrowserTest::DisconnectMe2Me() { 384 void RemoteDesktopBrowserTest::DisconnectMe2Me() {
385 // The chromoting extension should be installed. 385 // The chromoting extension should be installed.
386 ASSERT_TRUE(extension_); 386 ASSERT_TRUE(extension_);
387 387
388 ASSERT_TRUE(RemoteDesktopBrowserTest::IsSessionConnected()); 388 ASSERT_TRUE(RemoteDesktopBrowserTest::IsSessionConnected());
389 389
390 ExecuteScript("remoting.disconnect();"); 390 ExecuteScript("remoting.app.disconnect();");
391 391
392 EXPECT_TRUE(HtmlElementVisible("client-dialog")); 392 EXPECT_TRUE(HtmlElementVisible("client-dialog"));
393 EXPECT_TRUE(HtmlElementVisible("client-reconnect-button")); 393 EXPECT_TRUE(HtmlElementVisible("client-reconnect-button"));
394 EXPECT_TRUE(HtmlElementVisible("client-finished-me2me-button")); 394 EXPECT_TRUE(HtmlElementVisible("client-finished-me2me-button"));
395 395
396 ClickOnControl("client-finished-me2me-button"); 396 ClickOnControl("client-finished-me2me-button");
397 397
398 EXPECT_FALSE(HtmlElementVisible("client-dialog")); 398 EXPECT_FALSE(HtmlElementVisible("client-dialog"));
399 } 399 }
400 400
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 927
928 ConditionalTimeoutWaiter homeWaiter( 928 ConditionalTimeoutWaiter homeWaiter(
929 base::TimeDelta::FromSeconds(5), 929 base::TimeDelta::FromSeconds(5),
930 base::TimeDelta::FromMilliseconds(500), 930 base::TimeDelta::FromMilliseconds(500),
931 base::Bind(&RemoteDesktopBrowserTest::IsAppModeEqualTo, 931 base::Bind(&RemoteDesktopBrowserTest::IsAppModeEqualTo,
932 this, "remoting.AppMode.HOME")); 932 this, "remoting.AppMode.HOME"));
933 EXPECT_TRUE(homeWaiter.Wait()); 933 EXPECT_TRUE(homeWaiter.Wait());
934 } 934 }
935 935
936 } // namespace remoting 936 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/remoting_webapp_files.gypi » ('j') | remoting/webapp/app_remoting/js/app_remoting.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698