chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc - Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal

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/captive_portal/captive_portal_tab_helper_unittest.cc

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move CaptivePortalDetector to a component Created 6 years, 8 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

« chrome/browser/captive_portal/captive_portal_service.cc ('K') | « chrome/browser/captive_portal/captive_portal_tab_helper.cc ('k') | chrome/browser/captive_portal/captive_portal_tab_reloader.h » ('j') | components/captive_portal/captive_portal_detector.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

index 02653eda8b1a0862615fca8ded0f915da76d176f..0843b1e99b2bec03965df729f8c3693a4e232331 100644

--- a/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

+++ b/chrome/browser/captive_portal/captive_portal_tab_helper_unittest.cc

@@ -54,7 +54,8 @@ class MockCaptivePortalTabReloader : public CaptivePortalTabReloader {

MOCK_METHOD1(OnLoadCommitted, void(int));

MOCK_METHOD0(OnAbort, void());

MOCK_METHOD1(OnRedirect, void(bool));

- MOCK_METHOD2(OnCaptivePortalResults, void(Result, Result));

+ MOCK_METHOD2(OnCaptivePortalResults,

+ void(CaptivePortalResult, CaptivePortalResult));

};

// Inherits from the ChromeRenderViewHostTestHarness to gain access to

@@ -179,7 +180,8 @@ class CaptivePortalTabHelperTest : public ChromeRenderViewHostTestHarness {

}

// Simulates a captive portal redirect by calling the Observe method.

- void ObservePortalResult(Result previous_result, Result result) {

+ void ObservePortalResult(CaptivePortalResult previous_result,

+ CaptivePortalResult result) {

content::Source<Profile> source_profile(NULL);

CaptivePortalService::Results results;