Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1621)

Unified Diff: chrome/browser/chromeos/network_state_notifier_browsertest.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
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)

Powered by Google App Engine
This is Rietveld 408576698