chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc - Issue 2576353002: Make AppWindowWaiter a common test support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

Issue 2576353002: Make AppWindowWaiter a common test support (Closed)

Patch Set: nits Created 4 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_crash_restore_browsertest.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

diff --git a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

index a0b61f3c54409d4c1bcc541febe982bbd658a0f1..94f9f24043fbf1843874cb62ef51992024a4cba0 100644

--- a/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

+++ b/chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.cc

@@ -2,6 +2,7 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

+#include "apps/test/app_window_waiter.h"

#include "base/command_line.h"

#include "base/compiler_specific.h"

#include "base/files/file_path.h"

@@ -9,7 +10,6 @@

#include "base/path_service.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"

-#include "chrome/browser/chromeos/login/test/app_window_waiter.h"

#include "chrome/browser/extensions/extension_browsertest.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -47,8 +47,9 @@ Profile* WaitForProfile() {

bool VerifyDemoAppLaunch() {

Profile* profile = WaitForProfile();

- return AppWindowWaiter(extensions::AppWindowRegistry::Get(profile),

- DemoAppLauncher::kDemoAppId).Wait() != NULL;

+ return apps::AppWindowWaiter(extensions::AppWindowRegistry::Get(profile),

+ DemoAppLauncher::kDemoAppId)

+ .Wait() != NULL;

}

bool VerifyNetworksDisabled() {