Revert 282837 because it broke non-chromeos builds.

trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

Index: trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
===================================================================
--- trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc	(revision 282838)
+++ trunk/src/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc	(working copy)
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "ash/system/chromeos/network/network_icon.h"
+#include "ash/system/chromeos/network/network_icon_animation.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
@@ -14,8 +16,6 @@
 #include "content/public/browser/web_ui.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/webui/web_ui_util.h"
-#include "ui/chromeos/network/network_icon.h"
-#include "ui/chromeos/network/network_icon_animation.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
@@ -128,7 +128,7 @@
 }
 
 NetworkDropdown::~NetworkDropdown() {
-  ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+  ash::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(
         this, FROM_HERE);
@@ -182,12 +182,13 @@
   base::string16 text;
   gfx::ImageSkia icon_image;
   bool animating = false;
-  ui::network_icon::GetDefaultNetworkImageAndLabel(
-      ui::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
+  ash::network_icon::GetDefaultNetworkImageAndLabel(
+      ash::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating);
   if (animating) {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
+    ash::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this);
   } else {
-    ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
+    ash::network_icon::NetworkIconAnimation::GetInstance()->
+        RemoveObserver(this);
   }
   SkBitmap icon_bitmap = icon_image.GetRepresentation(
       web_ui_->GetDeviceScaleFactor()).sk_bitmap();