Add a unified observer to replace NetworkManagerObserver

The new observer implementation allows one to use either of NetworkLibrary
or NetworkStateHandler to be notified of manager events.

Also, switch over a few trivial NetworkManagerObserver consumers to
use this new observer.

TBR=sky@ for chrome/*.gypi changes

BUG=chromium:181250, chromium:167232
TEST=existing tests, tested on device


Review URL: https://chromiumcodereview.appspot.com/12729002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187767 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc
index cae7667..7939f5b 100644
--- a/chrome/browser/chromeos/imageburner/burn_manager.cc
+++ b/chrome/browser/chromeos/imageburner/burn_manager.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/burn_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
@@ -204,7 +205,7 @@ BurnManager::BurnManager()
       state_machine_(new StateMachine()),
       bytes_image_download_progress_last_reported_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
-  CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
   CrosLibrary::Get()->GetBurnLibrary()->AddObserver(this);
   base::WeakPtr<BurnManager> weak_ptr(weak_ptr_factory_.GetWeakPtr());
   device_handler_.SetCallbacks(
@@ -217,7 +218,7 @@ BurnManager::~BurnManager() {
     file_util::Delete(image_dir_, true);
   }
   CrosLibrary::Get()->GetBurnLibrary()->RemoveObserver(this);
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
 }
 
 // static
@@ -418,7 +419,7 @@ void BurnManager::BurnProgressUpdated(BurnLibrary* object,
       Observer, observers_, OnBurnProgressUpdated(event, status));
 }
 
-void BurnManager::OnNetworkManagerChanged(NetworkLibrary* obj) {
+void BurnManager::NetworkManagerChanged() {
   // TODO(hidehiko): Split this into a class to write tests.
   if (state_machine_->state() == StateMachine::INITIAL && IsNetworkConnected())
     FOR_EACH_OBSERVER(Observer, observers_, OnNetworkDetected());
diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h
index ba67dc6..a7c7a22 100644
--- a/chrome/browser/chromeos/imageburner/burn_manager.h
+++ b/chrome/browser/chromeos/imageburner/burn_manager.h
@@ -16,8 +16,8 @@
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/burn_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/imageburner/burn_device_handler.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
@@ -180,7 +180,7 @@ class StateMachine {
 // BurnController and helper classes defined above.
 class BurnManager : public net::URLFetcherDelegate,
                     public BurnLibrary::Observer,
-                    public NetworkLibrary::NetworkManagerObserver {
+                    public ConnectivityStateHelperObserver {
  public:
 
   // Interface for classes that need to observe events for the burning image
@@ -293,13 +293,13 @@ class BurnManager : public net::URLFetcherDelegate,
                                           int64 current,
                                           int64 total) OVERRIDE;
 
-  // BurnLibrary::Observer orverrides.
+  // BurnLibrary::Observer overrides.
   virtual void BurnProgressUpdated(BurnLibrary* object,
                                    BurnEvent event,
                                    const ImageBurnStatus& status) OVERRIDE;
 
-  // NetworkLibrary::NetworkManagerObserver interface.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
+  // ConnectivityStateHelperObserver override.
+  virtual void NetworkManagerChanged() OVERRIDE;
 
   // Creates directory image will be downloaded to.
   // Must be called from FILE thread.