| Index: chrome/browser/chromeos/network_state_notifier_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/network_state_notifier_browsertest.cc (revision 91880)
|
| +++ chrome/browser/chromeos/network_state_notifier_browsertest.cc (working copy)
|
| @@ -40,11 +40,11 @@
|
| }
|
|
|
| // NotificationObserver overrides.
|
| - virtual void Observe(NotificationType type,
|
| + virtual void Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - EXPECT_TRUE(NotificationType::NETWORK_STATE_CHANGED == type);
|
| + EXPECT_TRUE(chrome::NETWORK_STATE_CHANGED == type);
|
| chromeos::NetworkStateDetails* state_details =
|
| Details<chromeos::NetworkStateDetails>(details).ptr();
|
| state_ = state_details->state();
|
| @@ -52,7 +52,7 @@
|
|
|
| void WaitForNotification() {
|
| ui_test_utils::WaitForNotification(
|
| - NotificationType::NETWORK_STATE_CHANGED);
|
| + chrome::NETWORK_STATE_CHANGED);
|
| }
|
|
|
| protected:
|
| @@ -63,7 +63,7 @@
|
| IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestConnected) {
|
| // NETWORK_STATE_CHAGNED has to be registered in UI thread.
|
| NotificationRegistrar registrar;
|
| - registrar.Add(this, NotificationType::NETWORK_STATE_CHANGED,
|
| + registrar.Add(this, chrome::NETWORK_STATE_CHANGED,
|
| NotificationService::AllSources());
|
| EXPECT_CALL(*mock_network_library_, Connected())
|
| .Times(1)
|
| @@ -77,7 +77,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestConnecting) {
|
| NotificationRegistrar registrar;
|
| - registrar.Add(this, NotificationType::NETWORK_STATE_CHANGED,
|
| + registrar.Add(this, chrome::NETWORK_STATE_CHANGED,
|
| NotificationService::AllSources());
|
| EXPECT_CALL(*mock_network_library_, Connected())
|
| .Times(1)
|
| @@ -95,7 +95,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(NetworkStateNotifierTest, TestDisconnected) {
|
| NotificationRegistrar registrar;
|
| - registrar.Add(this, NotificationType::NETWORK_STATE_CHANGED,
|
| + registrar.Add(this, chrome::NETWORK_STATE_CHANGED,
|
| NotificationService::AllSources());
|
| EXPECT_CALL(*mock_network_library_, Connected())
|
| .Times(1)
|
|
|