Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 658 matching lines @@
         'browser/chromeos/native_dialog_window.cc',
         'browser/chromeos/native_dialog_window.h',
         'browser/chromeos/net/cros_network_change_notifier_factory.cc',
         'browser/chromeos/net/cros_network_change_notifier_factory.h',
         'browser/chromeos/net/network_change_notifier_chromeos.cc',
         'browser/chromeos/net/network_change_notifier_chromeos.h',
         'browser/chromeos/network_login_observer.cc',
         'browser/chromeos/network_login_observer.h',
         'browser/chromeos/network_message_observer.cc',
         'browser/chromeos/network_message_observer.h',
-        'browser/chromeos/network_state_notifier.cc',
-        'browser/chromeos/network_state_notifier.h',
         'browser/chromeos/notifications/balloon_collection_impl.cc',
         'browser/chromeos/notifications/balloon_collection_impl.h',
         'browser/chromeos/notifications/balloon_view.cc',
         'browser/chromeos/notifications/balloon_view.h',
         'browser/chromeos/notifications/balloon_view_host.cc',
         'browser/chromeos/notifications/balloon_view_host.h',
         'browser/chromeos/notifications/notification_panel.cc',
         'browser/chromeos/notifications/notification_panel.h',
         'browser/chromeos/notifications/system_notification.cc',
         'browser/chromeos/notifications/system_notification.h',
@@ skipping 4384 matching lines @@
               # weak imports in dependents, who still must #include
               # closure_blocks_leopard_compat.h to get weak imports.
               'type': 'none',
             }],
           ],
         },
       ],
     }],
   ],
 }