Merge NetworkListViewBase hierarchy and NetworkStateListDetailedView

ash/system/network/network_list_view_base.h

Index: ash/system/network/network_list_view_base.h
diff --git a/ash/system/network/network_list_view_base.h b/ash/system/network/network_list_view_base.h
deleted file mode 100644
index cd37c9580ce1f22947e09f822e1f0172f3852e9b..0000000000000000000000000000000000000000
--- a/ash/system/network/network_list_view_base.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015 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 ASH_SYSTEM_NETWORK_NETWORK_LIST_VIEW_BASE_H_
-#define ASH_SYSTEM_NETWORK_NETWORK_LIST_VIEW_BASE_H_
-
-#include <string>
-
-#include "base/macros.h"
-
-namespace views {
-class View;
-}
-
-namespace ash {
-namespace tray {
-class NetworkStateListDetailedView;
-}
-
-// Base class for a list of available networks (and, in the case of VPNs, the
-// list of available VPN providers).
-class NetworkListViewBase {
- public:
-  virtual ~NetworkListViewBase();
-
-  void set_container(views::View* container) { container_ = container; }
-
-  // Refreshes the network list.
-  virtual void Update() = 0;
-
-  // Checks whether |view| represents a network in the list. If yes, sets
-  // |guid| to the network's guid and returns |true|. Otherwise,
-  // leaves |guid| unchanged and returns |false|.
-  virtual bool IsNetworkEntry(views::View* view, std::string* guid) const = 0;
-
- protected:
-  explicit NetworkListViewBase(
-      tray::NetworkStateListDetailedView* detailed_view);
-
-  tray::NetworkStateListDetailedView* detailed_view() const {
-    return detailed_view_;
-  }
-
-  views::View* container() const { return container_; }
-
- private:
-  tray::NetworkStateListDetailedView* const detailed_view_;
-
-  // The container that holds the actual list entries.
-  views::View* container_ = nullptr;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkListViewBase);
-};
-
-}  // namespace ash
-
-#endif  // ASH_SYSTEM_NETWORK_NETWORK_LIST_VIEW_BASE_H_