chrome/browser/chromeos/network_state_notifier_browsertest.cc - Issue 5734002: Continuation of CL 5685007, rename the singleton accessor method in more files.

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

Issue 5734002: Continuation of CL 5685007, rename the singleton accessor method in more files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 10 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

« chrome/browser/chromeos/gview_request_interceptor.h ('K') | « chrome/browser/chromeos/network_state_notifier.cc ('k') | chrome/browser/chromeos/system_key_event_listener.h » ('j') | chrome/browser/chromeos/usb_mount_observer_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/network_state_notifier_browsertest.cc

diff --git a/chrome/browser/chromeos/network_state_notifier_browsertest.cc b/chrome/browser/chromeos/network_state_notifier_browsertest.cc

index 47ea0de661710f4d8f0ff5ce099d2fc172b022c4..35490a4dc420bc7087c594329495e1cadd876d28 100644

--- a/chrome/browser/chromeos/network_state_notifier_browsertest.cc

+++ b/chrome/browser/chromeos/network_state_notifier_browsertest.cc

@@ -36,7 +36,7 @@ class NetworkStateNotifierTest : public CrosInProcessBrowserTest,

.Times(1)

.WillRepeatedly((Return(true)))

.RetiresOnSaturation();

- NetworkStateNotifier::Get();

+ NetworkStateNotifier::GetInstance();

}

// NotificationObserver overrides.

@@ -69,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestConnected) {

.Times(1)

.WillRepeatedly((Return(true)))

.RetiresOnSaturation();

- NetworkStateNotifier* notifier = NetworkStateNotifier::Get();

+ NetworkStateNotifier* notifier = NetworkStateNotifier::GetInstance();

notifier->OnNetworkManagerChanged(mock_network_library_);

WaitForNotification();

EXPECT_EQ(chromeos::NetworkStateDetails::CONNECTED, state_);

@@ -87,7 +87,7 @@ IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestConnecting) {

.Times(1)

.WillOnce((Return(true)))

.RetiresOnSaturation();

- NetworkStateNotifier* notifier = NetworkStateNotifier::Get();

+ NetworkStateNotifier* notifier = NetworkStateNotifier::GetInstance();

notifier->OnNetworkManagerChanged(mock_network_library_);

WaitForNotification();

EXPECT_EQ(chromeos::NetworkStateDetails::CONNECTING, state_);

@@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestDisconnected) {

.Times(1)

.WillOnce((Return(false)))

.RetiresOnSaturation();

- NetworkStateNotifier* notifier = NetworkStateNotifier::Get();

+ NetworkStateNotifier* notifier = NetworkStateNotifier::GetInstance();

notifier->OnNetworkManagerChanged(mock_network_library_);

WaitForNotification();

EXPECT_EQ(chromeos::NetworkStateDetails::DISCONNECTED, state_);