diff options
author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 16:52:35 +0000 |
---|---|---|
committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 16:52:35 +0000 |
commit | dc8caba097e35e536697f3bf6605257317640d26 (patch) | |
tree | c42c13e876f1eaaca5229b67325f1efd3d398155 /chrome/browser/chromeos/network_state_notifier_browsertest.cc | |
parent | 6714f3048ea032bbe62b2566583a2790d78fc644 (diff) | |
download | chromium_src-dc8caba097e35e536697f3bf6605257317640d26.zip chromium_src-dc8caba097e35e536697f3bf6605257317640d26.tar.gz chromium_src-dc8caba097e35e536697f3bf6605257317640d26.tar.bz2 |
Rename all methods accessing Singleton<T> as GetInstance().
This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton.
This primarily covers files in chrome os and other directories, missed in the previous CL.
In a couple of files i changed Singleton<T> usage to LazyInstance<T>, because changing the method name to GetInstance() in there would require a whole lot of updates throughout the chrome os codebase.
BUG=65298
TEST=all existing tests should pass.
Review URL: http://codereview.chromium.org/5734002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/network_state_notifier_browsertest.cc')
-rw-r--r-- | chrome/browser/chromeos/network_state_notifier_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/network_state_notifier_browsertest.cc b/chrome/browser/chromeos/network_state_notifier_browsertest.cc index 47ea0de..35490a4 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_); |