Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/browser/chromeos/network_state_notifier.cc

Index: chrome/browser/chromeos/network_state_notifier.cc
===================================================================
--- chrome/browser/chromeos/network_state_notifier.cc	(revision 102292)
+++ chrome/browser/chromeos/network_state_notifier.cc	(working copy)
@@ -1,93 +0,0 @@
-// Copyright (c) 2011 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 "chrome/browser/chromeos/network_state_notifier.h"
-
-#include "base/message_loop.h"
-#include "base/time.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "content/browser/browser_thread.h"
-#include "content/common/content_notification_types.h"
-#include "content/common/notification_service.h"
-
-namespace chromeos {
-
-using base::Time;
-using base::TimeDelta;
-
-// static
-NetworkStateNotifier* NetworkStateNotifier::GetInstance() {
-  return Singleton<NetworkStateNotifier>::get();
-}
-
-// static
-TimeDelta NetworkStateNotifier::GetOfflineDuration() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // TODO(oshima): make this instance method so that
-  // we can mock this for ui_tests.
-  // http://crbug.com/4825 .
-  return base::Time::Now() - GetInstance()->offline_start_time_;
-}
-
-NetworkStateNotifier::NetworkStateNotifier()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
-      state_(RetrieveState()),
-      offline_start_time_(Time::Now()) {
-  // Note that this gets added as a NetworkManagerObserver
-  // in browser_init.cc
-}
-
-NetworkStateNotifier::~NetworkStateNotifier() {
-  // Let the NetworkManagerObserver leak to avoid a DCHECK
-  // failure in CommandLine::ForCurrentProcess.
-//  if (CrosLibrary::Get()->EnsureLoaded())
-//    CrosLibrary::Get()->GetNetworkLibrary()->
-//        RemoveNetworkManagerObserver(this);
-}
-
-void NetworkStateNotifier::OnNetworkManagerChanged(NetworkLibrary* cros) {
-  // Update the state 500ms later using UI thread.
-  // See http://crosbug.com/4558
-  BrowserThread::PostDelayedTask(
-      BrowserThread::UI, FROM_HERE,
-      task_factory_.NewRunnableMethod(
-          &NetworkStateNotifier::UpdateNetworkState,
-          RetrieveState()),
-      500);
-}
-
-void NetworkStateNotifier::UpdateNetworkState(
-    NetworkStateDetails::State new_state) {
-  DVLOG(1) << "UpdateNetworkState: new=" << new_state << ", old=" << state_;
-  if (state_ == NetworkStateDetails::CONNECTED &&
-      new_state != NetworkStateDetails::CONNECTED) {
-    offline_start_time_ = Time::Now();
-  }
-
-  state_ = new_state;
-  NetworkStateDetails details(state_);
-  NotificationService::current()->Notify(
-      chrome::NOTIFICATION_NETWORK_STATE_CHANGED,
-      NotificationService::AllSources(),
-      Details<NetworkStateDetails>(&details));
-};
-
-// static
-NetworkStateDetails::State NetworkStateNotifier::RetrieveState() {
-  // If CrosLibrary isn't loaded yet, assume connected.
-  if (!CrosLibrary::Get()->EnsureLoaded())
-    return NetworkStateDetails::CONNECTED;
-  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
-  if (cros->Connected()) {
-    return NetworkStateDetails::CONNECTED;
-  } else if (cros->Connecting()) {
-    return NetworkStateDetails::CONNECTING;
-  } else {
-    return NetworkStateDetails::DISCONNECTED;
-  }
-}
-
-
-}  // namespace chromeos