Add NetworkHandler to own network handlers in src/chromeos/network

ash/system/chromeos/network/tray_vpn.cc

 // Copyright (c) 2012 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.
 
 #include "ash/system/chromeos/network/tray_vpn.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_list_detailed_view_base.h"
 #include "ash/system/chromeos/network/network_state_list_detailed_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_more.h"
 #include "ash/system/tray/tray_popup_label_button.h"
 #include "base/command_line.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
 
 namespace {
 
 bool UseNewNetworkHandlers() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
-      ash::switches::kAshDisableNewNetworkStatusArea) &&
-      NetworkStateHandler::IsInitialized();
+      ash::switches::kAshDisableNewNetworkStatusArea);
 }
 
 }
 
 namespace ash {
 namespace internal {
 
 namespace tray {
 
 class VpnDefaultView : public TrayItemMore,
                        public network_icon::AnimationObserver {
  public:
   VpnDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {
     Update();
   }
 
   virtual ~VpnDefaultView() {
     if (UseNewNetworkHandlers())
       network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
     // Do not show VPN line in uber tray bubble if VPN is not configured.
     if (UseNewNetworkHandlers()) {
-      NetworkStateHandler* handler = NetworkStateHandler::Get();
+      NetworkStateHandler* handler =
+          NetworkHandler::Get()->network_state_handler();
       const NetworkState* vpn = handler->FirstNetworkByType(
           flimflam::kTypeVPN);
       return vpn != NULL;
     } else {
       std::vector<NetworkIconInfo> list;
       Shell::GetInstance()->system_tray_delegate()->GetVirtualNetworks(&list);
       return list.size() != 0;
     }
   }
 
@@ skipping 22 matching lines @@
 
   // network_icon::AnimationObserver
   virtual void NetworkIconChanged() OVERRIDE {
     Update();
   }
 
  private:
   void GetNetworkStateHandlerImageAndLabel(gfx::ImageSkia* image,
                                            base::string16* label,
                                            bool* animating) {
-    NetworkStateHandler* handler = NetworkStateHandler::Get();
+    NetworkStateHandler* handler =
+        NetworkHandler::Get()->network_state_handler();
     const NetworkState* vpn = handler->FirstNetworkByType(
         flimflam::kTypeVPN);
     if (!vpn || (vpn->connection_state() == flimflam::kStateIdle)) {
       *image = network_icon::GetImageForDisconnectedNetwork(
           network_icon::ICON_TYPE_DEFAULT_VIEW, flimflam::kTypeVPN);
       if (label) {
         *label = l10n_util::GetStringUTF16(
             IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED);
       }
       *animating = false;
@@ skipping 218 matching lines @@
   }
 }
 
 void TrayVPN::NetworkServiceChanged(const chromeos::NetworkState* network) {
   if (detailed_)
     detailed_->NetworkServiceChanged(network);
 }
 
 }  // namespace internal
 }  // namespace ash