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

ash/system/tray/system_tray.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/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 262 matching lines @@
   bool can_activate_;
 
   int autoclose_delay_;
   base::OneShotTimer<SystemTrayBubble> autoclose_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayBubble);
 };
 
 }  // namespace internal
 
-NetworkIconInfo::NetworkIconInfo() {
-}
-
 SystemTray::SystemTray()
     : items_(),
       bubble_(NULL),
       popup_(NULL) {
   container_ = new views::View;
   container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 5, 0, 3));
   container_->set_background(new SystemTrayBackground);
   set_border(views::Border::CreateEmptyBorder(0, 0,
         kPaddingFromBottomOfScreen, kPaddingFromRightEdgeOfScreen));
@@ skipping 133 matching lines @@
   SchedulePaint();
 }
 
 void SystemTray::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(popup_, widget);
   popup_ = NULL;
   bubble_ = NULL;
 }
 
 }  // namespace ash