Rename ash::TrayNetworkStateObserver ash::TrayNetworkStateModel

Ths CL renames TrayNetworkStateObserver -> TrayNetworkStateModel
to better reflect its purpose.

Bug: 862420
Change-Id: I129419cb6278401bd2f6f710aecf633e8e71501f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1622427Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#662185}

ash/BUILD.gn

@@ -765,8 +765,8 @@ component("ash") {
     "system/network/network_tray_view.h",
     "system/network/sms_observer.cc",
     "system/network/sms_observer.h",
-    "system/network/tray_network_state_observer.cc",
-    "system/network/tray_network_state_observer.h",
+    "system/network/tray_network_state_model.cc",
+    "system/network/tray_network_state_model.h",
     "system/network/unified_network_detailed_view_controller.cc",
     "system/network/unified_network_detailed_view_controller.h",
     "system/network/unified_vpn_detailed_view_controller.cc",

ash/system/model/system_tray_model.cc

@@ -14,7 +14,7 @@
 #include "ash/system/model/update_model.h"
 #include "ash/system/model/virtual_keyboard_model.h"
 #include "ash/system/network/active_network_icon.h"
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/unified/unified_system_tray.h"
 #include "base/logging.h"
@@ -29,10 +29,10 @@ SystemTrayModel::SystemTrayModel(service_manager::Connector* connector)
       tracing_(std::make_unique<TracingModel>()),
       update_model_(std::make_unique<UpdateModel>()),
       virtual_keyboard_(std::make_unique<VirtualKeyboardModel>()),
-      network_observer_(std::make_unique<TrayNetworkStateObserver>(connector)),
+      network_state_model_(std::make_unique<TrayNetworkStateModel>(connector)),
       active_network_icon_(
           std::make_unique<ActiveNetworkIcon>(connector,
-                                              network_observer_.get())) {}
+                                              network_state_model_.get())) {}
 
 SystemTrayModel::~SystemTrayModel() = default;
 

ash/system/model/system_tray_model.h

@@ -23,7 +23,7 @@ class EnterpriseDomainModel;
 class LocaleModel;
 class SessionLengthLimitModel;
 class TracingModel;
-class TrayNetworkStateObserver;
+class TrayNetworkStateModel;
 class UpdateModel;
 class VirtualKeyboardModel;
 
@@ -68,8 +68,8 @@ class SystemTrayModel : public mojom::SystemTray {
   TracingModel* tracing() { return tracing_.get(); }
   UpdateModel* update_model() { return update_model_.get(); }
   VirtualKeyboardModel* virtual_keyboard() { return virtual_keyboard_.get(); }
-  TrayNetworkStateObserver* network_observer() {
-    return network_observer_.get();
+  TrayNetworkStateModel* network_state_model() {
+    return network_state_model_.get();
   }
   ActiveNetworkIcon* active_network_icon() {
     return active_network_icon_.get();
@@ -84,7 +84,7 @@ class SystemTrayModel : public mojom::SystemTray {
   std::unique_ptr<TracingModel> tracing_;
   std::unique_ptr<UpdateModel> update_model_;
   std::unique_ptr<VirtualKeyboardModel> virtual_keyboard_;
-  std::unique_ptr<TrayNetworkStateObserver> network_observer_;
+  std::unique_ptr<TrayNetworkStateModel> network_state_model_;
   std::unique_ptr<ActiveNetworkIcon> active_network_icon_;
 
   // TODO(tetsui): Add following as a sub-model of SystemTrayModel:

ash/system/network/active_network_icon.cc

@@ -49,7 +49,7 @@ SkColor GetDefaultColorForIconType(network_icon::IconType icon_type) {
 }  // namespace
 
 ActiveNetworkIcon::ActiveNetworkIcon(service_manager::Connector* connector,
-                                     TrayNetworkStateObserver* model)
+                                     TrayNetworkStateModel* model)
     : model_(model), weak_ptr_factory_(this) {
   if (connector)  // May be null in tests.
     BindCrosNetworkConfig(connector);
@@ -296,7 +296,7 @@ void ActiveNetworkIcon::SetCellularUninitializedMsg() {
     cellular_uninitialized_msg_ = 0;
 }
 
-// TrayNetworkStateObserver::Observer
+// TrayNetworkStateModel::Observer
 
 void ActiveNetworkIcon::ActiveNetworkStateChanged() {
   SetCellularUninitializedMsg();

ash/system/network/active_network_icon.h

@@ -10,7 +10,7 @@
 
 #include "ash/ash_export.h"
 #include "ash/system/network/network_icon.h"
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
@@ -40,7 +40,7 @@ namespace ash {
 // TODO(stevenjb): Move all test coverage to active_network_icon_unittest.cc and
 // test Dual icon methods.
 // This class is also responsible for periodically purging the icon cache.
-class ASH_EXPORT ActiveNetworkIcon : public TrayNetworkStateObserver::Observer {
+class ASH_EXPORT ActiveNetworkIcon : public TrayNetworkStateModel::Observer {
  public:
   enum class Type {
     kSingle,    // A single network icon in the tray.
@@ -49,7 +49,7 @@ class ASH_EXPORT ActiveNetworkIcon : public TrayNetworkStateObserver::Observer {
   };
 
   ActiveNetworkIcon(service_manager::Connector* connector,
-                    TrayNetworkStateObserver* model);
+                    TrayNetworkStateModel* model);
   ~ActiveNetworkIcon() override;
 
   // Provides the a11y and tooltip strings for |type|.
@@ -86,13 +86,13 @@ class ASH_EXPORT ActiveNetworkIcon : public TrayNetworkStateObserver::Observer {
 
   void SetCellularUninitializedMsg();
 
-  // TrayNetworkStateObserver::Observer
+  // TrayNetworkStateModel::Observer
   void ActiveNetworkStateChanged() override;
   void NetworkListChanged() override;
 
   void PurgeNetworkIconCache();
 
-  TrayNetworkStateObserver* model_;
+  TrayNetworkStateModel* model_;
 
   chromeos::network_config::mojom::CrosNetworkConfigPtr
       cros_network_config_ptr_;

ash/system/network/active_network_icon_unittest.cc

@@ -9,7 +9,7 @@
 
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/network/network_icon.h"
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ -41,10 +41,10 @@ class ActiveNetworkIconTest : public testing::Test {
   ~ActiveNetworkIconTest() override = default;
 
   void SetUp() override {
-    network_state_observer_ = std::make_unique<TrayNetworkStateObserver>(
+    network_state_model_ = std::make_unique<TrayNetworkStateModel>(
         network_config_helper_.connector());
     active_network_icon_ = std::make_unique<ActiveNetworkIcon>(
-        network_config_helper_.connector(), network_state_observer_.get());
+        network_config_helper_.connector(), network_state_model_.get());
   }
 
   void TearDown() override { active_network_icon_.reset(); }
@@ -157,7 +157,7 @@ class ActiveNetworkIconTest : public testing::Test {
  private:
   const base::MessageLoop message_loop_;
   chromeos::network_config::CrosNetworkConfigTestHelper network_config_helper_;
-  std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
+  std::unique_ptr<TrayNetworkStateModel> network_state_model_;
   std::unique_ptr<ActiveNetworkIcon> active_network_icon_;
 
   std::string eth_path_;

ash/system/network/network_feature_pod_button.cc

@@ -169,14 +169,15 @@ NetworkFeaturePodButton::NetworkFeaturePodButton(
   // NetworkHandler can be uninitialized in unit tests.
   if (!NetworkHandler::IsInitialized())
     return;
-  Shell::Get()->system_tray_model()->network_observer()->AddObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->AddObserver(this);
   ShowDetailedViewArrow();
   Update();
 }
 
 NetworkFeaturePodButton::~NetworkFeaturePodButton() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
-  Shell::Get()->system_tray_model()->network_observer()->RemoveObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->RemoveObserver(
+      this);
 }
 
 void NetworkFeaturePodButton::NetworkIconChanged() {

ash/system/network/network_feature_pod_button.h

@@ -6,7 +6,7 @@
 #define ASH_SYSTEM_NETWORK_NETWORK_FEATURE_POD_BUTTON_H_
 
 #include "ash/system/network/network_icon_animation_observer.h"
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/unified/feature_pod_button.h"
 
 namespace ash {
@@ -15,7 +15,7 @@ namespace ash {
 // animation to implement network connecting animation on feature pod button.
 class NetworkFeaturePodButton : public FeaturePodButton,
                                 public network_icon::AnimationObserver,
-                                public TrayNetworkStateObserver::Observer {
+                                public TrayNetworkStateModel::Observer {
  public:
   explicit NetworkFeaturePodButton(FeaturePodControllerBase* controller);
   ~NetworkFeaturePodButton() override;
@@ -23,7 +23,7 @@ class NetworkFeaturePodButton : public FeaturePodButton,
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override;
 
-  // TrayNetworkStateObserver::Observer:
+  // TrayNetworkStateModel::Observer:
   void ActiveNetworkStateChanged() override;
 
   // views::Button:

ash/system/network/network_icon_unittest.cc

@@ -41,10 +41,10 @@ class NetworkIconTest : public testing::Test {
 
   void SetUp() override {
     SetUpDefaultNetworkState();
-    network_state_observer_ = std::make_unique<TrayNetworkStateObserver>(
+    network_state_model_ = std::make_unique<TrayNetworkStateModel>(
         network_config_helper_.connector());
     active_network_icon_ = std::make_unique<ActiveNetworkIcon>(
-        network_config_helper_.connector(), network_state_observer_.get());
+        network_config_helper_.connector(), network_state_model_.get());
   }
 
   void TearDown() override {
@@ -153,7 +153,7 @@ class NetworkIconTest : public testing::Test {
  private:
   const base::MessageLoop message_loop_;
   chromeos::network_config::CrosNetworkConfigTestHelper network_config_helper_;
-  std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
+  std::unique_ptr<TrayNetworkStateModel> network_state_model_;
   std::unique_ptr<ActiveNetworkIcon> active_network_icon_;
 
   // Preconfigured service paths:

ash/system/network/network_tray_view.cc

@@ -33,7 +33,7 @@ network_icon::IconType GetIconType() {
 
 NetworkTrayView::NetworkTrayView(Shelf* shelf, ActiveNetworkIcon::Type type)
     : TrayItemView(shelf), type_(type) {
-  Shell::Get()->system_tray_model()->network_observer()->AddObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->AddObserver(this);
   CreateImageView();
   UpdateNetworkStateHandlerIcon();
   UpdateConnectionStatus(true /* notify_a11y */);
@@ -41,7 +41,8 @@ NetworkTrayView::NetworkTrayView(Shelf* shelf, ActiveNetworkIcon::Type type)
 
 NetworkTrayView::~NetworkTrayView() {
   network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
-  Shell::Get()->system_tray_model()->network_observer()->RemoveObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->RemoveObserver(
+      this);
 }
 
 const char* NetworkTrayView::GetClassName() const {

ash/system/network/network_tray_view.h

@@ -10,7 +10,7 @@
 #include "ash/session/session_observer.h"
 #include "ash/system/network/active_network_icon.h"
 #include "ash/system/network/network_icon_animation_observer.h"
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "base/macros.h"
 
@@ -23,7 +23,7 @@ namespace tray {
 class NetworkTrayView : public TrayItemView,
                         public network_icon::AnimationObserver,
                         public SessionObserver,
-                        public TrayNetworkStateObserver::Observer {
+                        public TrayNetworkStateModel::Observer {
  public:
   ~NetworkTrayView() override;
 
@@ -42,7 +42,7 @@ class NetworkTrayView : public TrayItemView,
   // SessionObserver:
   void OnSessionStateChanged(session_manager::SessionState state) override;
 
-  // TrayNetworkStateObserver::Observer:
+  // TrayNetworkStateModel::Observer:
   void ActiveNetworkStateChanged() override;
   void NetworkListChanged() override;
 

ash/system/network/tray_network_state_observer.cc → ash/system/network/tray_network_state_model.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 
 #include <set>
 #include <string>
@@ -47,7 +47,7 @@ NetworkStatePropertiesPtr GetConnectingOrConnected(
 
 namespace ash {
 
-TrayNetworkStateObserver::TrayNetworkStateObserver(
+TrayNetworkStateModel::TrayNetworkStateModel(
     service_manager::Connector* connector)
     : update_frequency_(kUpdateFrequencyMs) {
   if (ui::ScopedAnimationDurationScaleMode::duration_scale_mode() !=
@@ -58,45 +58,45 @@ TrayNetworkStateObserver::TrayNetworkStateObserver(
     BindCrosNetworkConfig(connector);
 }
 
-TrayNetworkStateObserver::~TrayNetworkStateObserver() = default;
+TrayNetworkStateModel::~TrayNetworkStateModel() = default;
 
-void TrayNetworkStateObserver::AddObserver(Observer* observer) {
+void TrayNetworkStateModel::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
-void TrayNetworkStateObserver::RemoveObserver(Observer* observer) {
+void TrayNetworkStateModel::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
-DeviceStateProperties* TrayNetworkStateObserver::GetDevice(NetworkType type) {
+DeviceStateProperties* TrayNetworkStateModel::GetDevice(NetworkType type) {
   auto iter = devices_.find(type);
   if (iter == devices_.end())
     return nullptr;
   return iter->second.get();
 }
 
-DeviceStateType TrayNetworkStateObserver::GetDeviceState(NetworkType type) {
+DeviceStateType TrayNetworkStateModel::GetDeviceState(NetworkType type) {
   DeviceStateProperties* device = GetDevice(type);
   return device ? device->state : DeviceStateType::kUnavailable;
 }
 
 // CrosNetworkConfigObserver
 
-void TrayNetworkStateObserver::OnActiveNetworksChanged(
+void TrayNetworkStateModel::OnActiveNetworksChanged(
     std::vector<NetworkStatePropertiesPtr> networks) {
   UpdateActiveNetworks(std::move(networks));
   SendActiveNetworkStateChanged();
 }
 
-void TrayNetworkStateObserver::OnNetworkStateListChanged() {
+void TrayNetworkStateModel::OnNetworkStateListChanged() {
   NotifyNetworkListChanged();
 }
 
-void TrayNetworkStateObserver::OnDeviceStateListChanged() {
+void TrayNetworkStateModel::OnDeviceStateListChanged() {
   GetDeviceStateList();
 }
 
-void TrayNetworkStateObserver::BindCrosNetworkConfig(
+void TrayNetworkStateModel::BindCrosNetworkConfig(
     service_manager::Connector* connector) {
   // Ensure bindings are reset in case this is called after a failure.
   cros_network_config_observer_binding_.Close();
@@ -111,16 +111,16 @@ void TrayNetworkStateObserver::BindCrosNetworkConfig(
 
   // If the connection is lost (e.g. due to a crash), attempt to rebind it.
   cros_network_config_ptr_.set_connection_error_handler(
-      base::BindOnce(&TrayNetworkStateObserver::BindCrosNetworkConfig,
+      base::BindOnce(&TrayNetworkStateModel::BindCrosNetworkConfig,
                      base::Unretained(this), connector));
 }
 
-void TrayNetworkStateObserver::GetDeviceStateList() {
+void TrayNetworkStateModel::GetDeviceStateList() {
   cros_network_config_ptr_->GetDeviceStateList(base::BindOnce(
-      &TrayNetworkStateObserver::OnGetDeviceStateList, base::Unretained(this)));
+      &TrayNetworkStateModel::OnGetDeviceStateList, base::Unretained(this)));
 }
 
-void TrayNetworkStateObserver::OnGetDeviceStateList(
+void TrayNetworkStateModel::OnGetDeviceStateList(
     std::vector<DeviceStatePropertiesPtr> devices) {
   devices_.clear();
   for (auto& device : devices) {
@@ -133,16 +133,16 @@ void TrayNetworkStateObserver::OnGetDeviceStateList(
   GetActiveNetworks();  // Will trigger an observer event.
 }
 
-void TrayNetworkStateObserver::GetActiveNetworks() {
+void TrayNetworkStateModel::GetActiveNetworks() {
   DCHECK(cros_network_config_ptr_);
   cros_network_config_ptr_->GetNetworkStateList(
       NetworkFilter::New(FilterType::kActive, NetworkType::kAll,
                          /*limit=*/0),
-      base::BindOnce(&TrayNetworkStateObserver::OnActiveNetworksChanged,
+      base::BindOnce(&TrayNetworkStateModel::OnActiveNetworksChanged,
                      base::Unretained(this)));
 }
 
-void TrayNetworkStateObserver::UpdateActiveNetworks(
+void TrayNetworkStateModel::UpdateActiveNetworks(
     std::vector<NetworkStatePropertiesPtr> networks) {
   active_cellular_.reset();
   active_vpn_.reset();
@@ -196,27 +196,27 @@ void TrayNetworkStateObserver::UpdateActiveNetworks(
       GetConnectingOrConnected(connecting_non_cellular, connected_non_cellular);
 }
 
-void TrayNetworkStateObserver::NotifyNetworkListChanged() {
+void TrayNetworkStateModel::NotifyNetworkListChanged() {
   if (timer_.IsRunning())
     return;
   timer_.Start(
       FROM_HERE, base::TimeDelta::FromMilliseconds(update_frequency_),
-      base::BindRepeating(&TrayNetworkStateObserver::SendNetworkListChanged,
+      base::BindRepeating(&TrayNetworkStateModel::SendNetworkListChanged,
                           base::Unretained(this)));
 }
 
-void TrayNetworkStateObserver::SendActiveNetworkStateChanged() {
+void TrayNetworkStateModel::SendActiveNetworkStateChanged() {
   for (auto& observer : observer_list_)
     observer.ActiveNetworkStateChanged();
 }
 
-void TrayNetworkStateObserver::SendNetworkListChanged() {
+void TrayNetworkStateModel::SendNetworkListChanged() {
   for (auto& observer : observer_list_)
     observer.NetworkListChanged();
 }
 
-void TrayNetworkStateObserver::Observer::ActiveNetworkStateChanged() {}
+void TrayNetworkStateModel::Observer::ActiveNetworkStateChanged() {}
 
-void TrayNetworkStateObserver::Observer::NetworkListChanged() {}
+void TrayNetworkStateModel::Observer::NetworkListChanged() {}
 
 }  // namespace ash

ash/system/network/tray_network_state_observer.h → ash/system/network/tray_network_state_model.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_
-#define ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_
+#ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_MODEL_H_
+#define ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_MODEL_H_
 
 #include <vector>
 
@@ -21,10 +21,10 @@ class Connector;
 
 namespace ash {
 
-// TrayNetworkStateObserver observes the mojo interface and tracks the devices
+// TrayNetworkStateModel observes the mojo interface and tracks the devices
 // and active networks. It has UI observers that are informed when important
 // changes occur.
-class ASH_EXPORT TrayNetworkStateObserver
+class ASH_EXPORT TrayNetworkStateModel
     : public chromeos::network_config::mojom::CrosNetworkConfigObserver {
  public:
   class Observer : public base::CheckedObserver {
@@ -36,8 +36,8 @@ class ASH_EXPORT TrayNetworkStateObserver
     virtual void NetworkListChanged();
   };
 
-  explicit TrayNetworkStateObserver(service_manager::Connector* connector);
-  ~TrayNetworkStateObserver() override;
+  explicit TrayNetworkStateModel(service_manager::Connector* connector);
+  ~TrayNetworkStateModel() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ -111,9 +111,9 @@ class ASH_EXPORT TrayNetworkStateObserver
   chromeos::network_config::mojom::NetworkStatePropertiesPtr active_cellular_;
   chromeos::network_config::mojom::NetworkStatePropertiesPtr active_vpn_;
 
-  DISALLOW_COPY_AND_ASSIGN(TrayNetworkStateObserver);
+  DISALLOW_COPY_AND_ASSIGN(TrayNetworkStateModel);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_OBSERVER_H_
+#endif  // ASH_SYSTEM_NETWORK_TRAY_NETWORK_STATE_MODEL_H_

ash/system/network/unified_network_detailed_view_controller.cc

@@ -16,11 +16,12 @@ UnifiedNetworkDetailedViewController::UnifiedNetworkDetailedViewController(
     UnifiedSystemTrayController* tray_controller)
     : detailed_view_delegate_(
           std::make_unique<DetailedViewDelegate>(tray_controller)) {
-  Shell::Get()->system_tray_model()->network_observer()->AddObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->AddObserver(this);
 }
 
 UnifiedNetworkDetailedViewController::~UnifiedNetworkDetailedViewController() {
-  Shell::Get()->system_tray_model()->network_observer()->RemoveObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->RemoveObserver(
+      this);
 }
 
 views::View* UnifiedNetworkDetailedViewController::CreateView() {

ash/system/network/unified_network_detailed_view_controller.h

@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_NETWORK_UNIFIED_NETWORK_DETAILED_VIEW_CONTROLLER_H_
 #define ASH_SYSTEM_NETWORK_UNIFIED_NETWORK_DETAILED_VIEW_CONTROLLER_H_
 
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/unified/detailed_view_controller.h"
 
 namespace ash {
@@ -20,7 +20,7 @@ class UnifiedSystemTrayController;
 // Controller of Network detailed view in UnifiedSystemTray.
 class UnifiedNetworkDetailedViewController
     : public DetailedViewController,
-      public TrayNetworkStateObserver::Observer {
+      public TrayNetworkStateModel::Observer {
  public:
   explicit UnifiedNetworkDetailedViewController(
       UnifiedSystemTrayController* tray_controller);
@@ -29,7 +29,7 @@ class UnifiedNetworkDetailedViewController
   // DetailedViewControllerBase:
   views::View* CreateView() override;
 
-  // TrayNetworkStateObserver::Observer:
+  // TrayNetworkStateModel::Observer:
   void ActiveNetworkStateChanged() override;
   void NetworkListChanged() override;
 

ash/system/network/unified_vpn_detailed_view_controller.cc

@@ -16,11 +16,12 @@ UnifiedVPNDetailedViewController::UnifiedVPNDetailedViewController(
     UnifiedSystemTrayController* tray_controller)
     : detailed_view_delegate_(
           std::make_unique<DetailedViewDelegate>(tray_controller)) {
-  Shell::Get()->system_tray_model()->network_observer()->AddObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->AddObserver(this);
 }
 
 UnifiedVPNDetailedViewController::~UnifiedVPNDetailedViewController() {
-  Shell::Get()->system_tray_model()->network_observer()->RemoveObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->RemoveObserver(
+      this);
 }
 
 views::View* UnifiedVPNDetailedViewController::CreateView() {

ash/system/network/unified_vpn_detailed_view_controller.h

@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_NETWORK_UNIFIED_VPN_DETAILED_VIEW_CONTROLLER_H_
 #define ASH_SYSTEM_NETWORK_UNIFIED_VPN_DETAILED_VIEW_CONTROLLER_H_
 
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/unified/detailed_view_controller.h"
 
 namespace ash {
@@ -20,7 +20,7 @@ class UnifiedSystemTrayController;
 // Controller of VPN detailed view in UnifiedSystemTray.
 class UnifiedVPNDetailedViewController
     : public DetailedViewController,
-      public TrayNetworkStateObserver::Observer {
+      public TrayNetworkStateModel::Observer {
  public:
   explicit UnifiedVPNDetailedViewController(
       UnifiedSystemTrayController* tray_controller);
@@ -29,7 +29,7 @@ class UnifiedVPNDetailedViewController
   // DetailedViewControllerBase:
   views::View* CreateView() override;
 
-  // TrayNetworkStateObserver::Observer:
+  // TrayNetworkStateModel::Observer:
   void ActiveNetworkStateChanged() override;
   void NetworkListChanged() override;
 

ash/system/network/vpn_feature_pod_controller.cc

@@ -64,11 +64,12 @@ bool IsVPNConnected() {
 VPNFeaturePodController::VPNFeaturePodController(
     UnifiedSystemTrayController* tray_controller)
     : tray_controller_(tray_controller) {
-  Shell::Get()->system_tray_model()->network_observer()->AddObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->AddObserver(this);
 }
 
 VPNFeaturePodController::~VPNFeaturePodController() {
-  Shell::Get()->system_tray_model()->network_observer()->RemoveObserver(this);
+  Shell::Get()->system_tray_model()->network_state_model()->RemoveObserver(
+      this);
 }
 
 FeaturePodButton* VPNFeaturePodController::CreateButton() {

ash/system/network/vpn_feature_pod_controller.h

@@ -5,7 +5,7 @@
 #ifndef ASH_SYSTEM_NETWORK_VPN_FEATURE_POD_CONTROLLER_H_
 #define ASH_SYSTEM_NETWORK_VPN_FEATURE_POD_CONTROLLER_H_
 
-#include "ash/system/network/tray_network_state_observer.h"
+#include "ash/system/network/tray_network_state_model.h"
 #include "ash/system/unified/feature_pod_controller_base.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -16,7 +16,7 @@ class UnifiedSystemTrayController;
 
 // Controller of vpn feature pod button.
 class VPNFeaturePodController : public FeaturePodControllerBase,
-                                public TrayNetworkStateObserver::Observer {
+                                public TrayNetworkStateModel::Observer {
  public:
   VPNFeaturePodController(UnifiedSystemTrayController* tray_controller);
   ~VPNFeaturePodController() override;
@@ -26,7 +26,7 @@ class VPNFeaturePodController : public FeaturePodControllerBase,
   void OnIconPressed() override;
   SystemTrayItemUmaType GetUmaType() const override;
 
-  // TrayNetworkStateObserver::Observer:
+  // TrayNetworkStateModel::Observer:
   void ActiveNetworkStateChanged() override;
 
  private: