chrome/browser/chromeos/login/kiosk_browsertest.cc - Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.

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/kiosk_browsertest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

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

Download patch

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

Index: chrome/browser/chromeos/login/kiosk_browsertest.cc

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

index 079c5b62bfe256fe0780fc722b25dc142c37d7d2..b91772b54675b4e5e43a8a589ece26311d3f2cbc 100644

--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc

+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -57,6 +57,7 @@

#include "extensions/browser/app_window/app_window_registry.h"

#include "extensions/browser/app_window/native_app_window.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/test/result_catcher.h"

#include "google_apis/gaia/gaia_constants.h"

#include "google_apis/gaia/gaia_switches.h"

#include "google_apis/gaia/gaia_urls.h"

@@ -1456,7 +1457,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PRE_PreserveLocalData) {

set_test_app_version("1.0.0");

set_test_crx_file(test_app_id() + ".crx");

- ResultCatcher catcher;

+ extensions::ResultCatcher catcher;

StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());

WaitForAppLaunchSuccess();

ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();

@@ -1468,7 +1469,7 @@ IN_PROC_BROWSER_TEST_F(KioskUpdateTest, PreserveLocalData) {

set_test_app_id(kTestLocalFsKioskApp);

set_test_app_version("2.0.0");

set_test_crx_file(test_app_id() + "_v2_read_and_verify_data.crx");

- ResultCatcher catcher;

+ extensions::ResultCatcher catcher;

StartAppLaunchFromLoginScreen(SimulateNetworkOnlineClosure());

WaitForAppLaunchSuccess();