Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/common/chrome_notification_types.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_
 #define CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_
 #pragma once
 
 #include "content/common/content_notification_types.h"
 
@@ skipping 758 matching lines @@
   // are not used.
   NOTIFICATION_WIZARD_CONTENT_VIEW_DESTROYED,
 
   // Sent when the screen lock state has changed. The source is
   // ScreenLocker and the details is a bool specifing that the
   // screen is locked. When details is a false, the source object
   // is being deleted, so the receiver shouldn't use the screen locker
   // object.
   NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
 
-  // Sent when the network state has changed on UI thread.
-  // The source is AllSources and the details is NetworkStateDetails defined
-  // in chrome/browser/chromeos/network_state_notifier.h.
-  // TODO(oshima): Port this to all platforms.
-  NOTIFICATION_NETWORK_STATE_CHANGED,
-
   // Sent when an attempt to acquire the public key of the owner of a chromium
   // os device has succeeded.
   NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_SUCCEEDED,
 
   // Sent when an attempt to acquire the public key of the owner of a chromium
   // os device has failed.
   NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_FAILED,
 
   // Sent after UserManager checked ownership status of logged in user.
   NOTIFICATION_OWNERSHIP_CHECKED,
@@ skipping 115 matching lines @@
   // Currently only Content and Chrome define and use notifications.
   // Custom notifications not belonging to Content and Chrome should start
   // from here.
   NOTIFICATION_CHROME_END,
 };
 
 }  // namespace chrome
 
 
 #endif  // CHROME_COMMON_CHROME_NOTIFICATION_TYPES_H_