chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc - Issue 299403012: Clean up shill fake implementations

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/ui/captive_portal_window_browsertest.cc

Issue 299403012: Clean up shill fake implementations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/test/oobe_base_test.cc ('k') | chrome/browser/chromeos/login/wizard_controller_browsertest.cc » ('j') | chromeos/network/network_state_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

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

index 6fc8c19a67cf98003ea28f913556ec7a0637550b..2ee8b5572ef3d9f1a5d3f29746d1c1dcfba9e42b 100644

--- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

@@ -16,13 +16,12 @@

#include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "chromeos/chromeos_switches.h"

+#include "chromeos/dbus/fake_shill_manager_client.h"

namespace chromeos {

namespace {

-const char kStubEthernetServicePath[] = "eth1";

// Stub implementation of CaptivePortalWindowProxyDelegate, does

// nothing and used to instantiate CaptivePortalWindowProxy.

class CaptivePortalWindowProxyStubDelegate

@@ -189,9 +188,9 @@ class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {

portal_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL;

portal_state.response_code = 200;

network_portal_detector_->SetDefaultNetworkPathForTesting(

- kStubEthernetServicePath);

+ FakeShillManagerClient::kFakeEthernetNetworkPath);

network_portal_detector_->SetDetectionResultsForTesting(

- kStubEthernetServicePath, portal_state);

+ FakeShillManagerClient::kFakeEthernetNetworkPath, portal_state);

}

protected: