Revert r126703 and r126704 since the fixes didn't stick.

ash/system/tray/system_tray_delegate.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "ash/system/user/login_status.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class SkBitmap;
 
 namespace ash {
 
 struct NetworkIconInfo {
-  NetworkIconInfo();
   SkBitmap image;
   string16 name;
   string16 description;
   std::string unique_id;
 };
 
 class SystemTrayDelegate {
  public:
   virtual ~SystemTrayDelegate() {}
 
@@ skipping 59 matching lines @@
   // Toggles airplane mode.
   virtual void ToggleAirplaneMode() = 0;
 
   // Shows UI for changing proxy settings.
   virtual void ChangeProxySettings() = 0;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_