Merge requested by sheriff kliegs to fix chromeos test redness.

chrome/browser/chromeos/network_state_notifier.h

Index: chrome/browser/chromeos/network_state_notifier.h
===================================================================
--- chrome/browser/chromeos/network_state_notifier.h	(revision 102292)
+++ chrome/browser/chromeos/network_state_notifier.h	(working copy)
@@ -1,92 +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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_NETWORK_STATE_NOTIFIER_H_
-#define CHROME_BROWSER_CHROMEOS_NETWORK_STATE_NOTIFIER_H_
-#pragma once
-
-#include "chrome/browser/chromeos/cros/network_library.h"
-
-#include "base/memory/singleton.h"
-#include "base/task.h"
-#include "base/time.h"
-
-namespace chromeos {
-
-// NetworkStateDetails contains the information about
-// network status.
-class NetworkStateDetails {
- public:
-  enum State {
-    UNKNOWN = 0,
-    DISCONNECTED,
-    CONNECTING,
-    CONNECTED,
-  };
-
-  State state() const {
-    return state_;
-  }
-
- private:
-  friend class NetworkStateNotifier;
-
-  explicit NetworkStateDetails(State state)
-      : state_(state) {
-  }
-
-  State state_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkStateDetails);
-};
-
-// NetworkStateNotifier sends notification when network state has
-// chagned. Notification is sent in UI thread.
-// TODO(oshima): port this to other platform. merge with
-// NetworkChangeNotifier if possible.
-class NetworkStateNotifier : public NetworkLibrary::NetworkManagerObserver {
- public:
-  // Returns the singleton instance of the network state notifier;
-  static NetworkStateNotifier* GetInstance();
-
-  // The duration of being in offline. The value is undefined when
-  // when network is connected.
-  static base::TimeDelta GetOfflineDuration();
-
-  // Returns true if the network is connected.
-  static bool is_connected() {
-    return GetInstance()->state_ == NetworkStateDetails::CONNECTED;
-  }
-
-  // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* cros);
-
- private:
-  friend struct DefaultSingletonTraits<NetworkStateNotifier>;
-
-  // Retrieve the current state from libcros.
-  static NetworkStateDetails::State RetrieveState();
-
-  NetworkStateNotifier();
-  virtual ~NetworkStateNotifier();
-
-  // Update the current state and sends notification to observers.
-  // This should be invoked in UI thread.
-  void UpdateNetworkState(NetworkStateDetails::State new_state);
-
-  // A factory to post a task in UI thread.
-  ScopedRunnableMethodFactory<NetworkStateNotifier> task_factory_;
-
-  // The current network state.
-  NetworkStateDetails::State state_;
-
-  // The start time of offline.
-  base::Time offline_start_time_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_STATE_NOTIFIER_H_