Reland 1e65c53ffdbcab7f2d25f064a3a7540166101e54 with fix for bad merge.

ash/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//ui/base/ui_features.gni")
 
 # Historical note: Ash shipped on Windows for a couple years to support
@@ skipping 217 matching lines @@
     "common/system/chromeos/media_security/multi_profile_media_tray_item.cc",
     "common/system/chromeos/media_security/multi_profile_media_tray_item.h",
     "common/system/chromeos/network/network_detailed_view.h",
     "common/system/chromeos/network/network_icon.cc",
     "common/system/chromeos/network/network_icon.h",
     "common/system/chromeos/network/network_icon_animation.cc",
     "common/system/chromeos/network/network_icon_animation.h",
     "common/system/chromeos/network/network_icon_animation_observer.h",
     "common/system/chromeos/network/network_info.cc",
     "common/system/chromeos/network/network_info.h",
-    "common/system/chromeos/network/network_list.cc",
-    "common/system/chromeos/network/network_list.h",
     "common/system/chromeos/network/network_list_delegate.h",
     "common/system/chromeos/network/network_list_md.cc",
     "common/system/chromeos/network/network_list_md.h",
     "common/system/chromeos/network/network_list_view_base.cc",
     "common/system/chromeos/network/network_list_view_base.h",
     "common/system/chromeos/network/network_observer.h",
     "common/system/chromeos/network/network_portal_detector_observer.h",
     "common/system/chromeos/network/network_state_list_detailed_view.cc",
     "common/system/chromeos/network/network_state_list_detailed_view.h",
     "common/system/chromeos/network/sms_observer.cc",
@@ skipping 1257 matching lines @@
     "//content/public/app:both",
     "//device/bluetooth",
   ]
 
   data_deps = [
     "//ash/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 }