Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/imageburner/burn_manager.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 "chrome/browser/chromeos/imageburner/burn_manager.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #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"
 #include "grit/generated_resources.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
@@ skipping 173 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 BurnManager::BurnManager()
     : device_handler_(disks::DiskMountManager::GetInstance()),
       config_file_url_(kConfigFileUrl),
       config_file_fetched_(false),
       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(
       base::Bind(&BurnManager::NotifyDeviceAdded, weak_ptr),
       base::Bind(&BurnManager::NotifyDeviceRemoved, weak_ptr));
 }
 
 BurnManager::~BurnManager() {
   if (!image_dir_.empty()) {
     file_util::Delete(image_dir_, true);
   }
   CrosLibrary::Get()->GetBurnLibrary()->RemoveObserver(this);
-  CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
 }
 
 // static
 void BurnManager::Initialize() {
   if (g_burn_manager) {
     LOG(WARNING) << "BurnManager was already initialized";
     return;
   }
   g_burn_manager = new BurnManager();
   VLOG(1) << "BurnManager initialized";
@@ skipping 180 matching lines @@
     // The burning task is successfully done.
     // Update the state.
     state_machine_->OnSuccess();
   }
 
   // Proxy the BurnLibrary callback to observers.
   FOR_EACH_OBSERVER(
       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());
 
   if (state_machine_->state() == StateMachine::DOWNLOADING &&
       !IsNetworkConnected())
     OnError(IDS_IMAGEBURN_NETWORK_ERROR);
 }
 
 void BurnManager::ConfigFileFetched(bool fetched, const std::string& content) {
@@ skipping 35 matching lines @@
     // Note: in theory, this is not a part of notification, but cancelling
     // the running burning task. However, there is no good place to be in the
     // current code.
     // TODO(hidehiko): Clean this up after refactoring.
     OnError(IDS_IMAGEBURN_DEVICE_NOT_FOUND_ERROR);
   }
 }
 
 }  // namespace imageburner
 }  // namespace chromeos