chrome/browser/chromeos/login/screens/network_screen_browsertest.cc - Issue 105193002: Replace string16 with base::string16.

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/screens/network_screen_browsertest.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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/login/screens/network_screen_actor.h ('k') | chrome/browser/chromeos/login/supervised_user_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

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

index a77d14cfeea4ca4f7651dc74afd3f72c626ec3dc..6ecde46a78d21b5fdc1eeef5e47e5a8551247e5f 100644

--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

@@ -36,7 +36,7 @@ namespace login {

class MockNetworkStateHelper : public NetworkStateHelper {

public:

- MOCK_CONST_METHOD0(GetCurrentNetworkName, string16(void));

+ MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void));

MOCK_CONST_METHOD0(IsConnected, bool(void));

MOCK_CONST_METHOD0(IsConnecting, bool(void));

};

@@ -95,7 +95,7 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {

void SetDefaultNetworkStateHelperExpectations() {

EXPECT_CALL(*mock_network_state_helper_, GetCurrentNetworkName())

.Times(AnyNumber())

- .WillRepeatedly((Return(string16())));

+ .WillRepeatedly((Return(base::string16())));

EXPECT_CALL(*mock_network_state_helper_, IsConnected())

.Times(AnyNumber())

.WillRepeatedly((Return(false)));