Clean up wake on wifi handling

chrome/browser/services/gcm/gcm_profile_service.cc

 // Copyright (c) 2013 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/services/gcm/gcm_profile_service.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 #if defined(OS_ANDROID)
 #include "components/gcm_driver/gcm_driver_android.h"
 #else
 #include "base/bind.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/services/gcm/chromeos_gcm_connection_observer.h"
-#endif
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/services/gcm/gcm_account_tracker.h"
 #include "chrome/browser/services/gcm/gcm_desktop_utils.h"
 #include "chrome/browser/signin/profile_identity_provider.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/gcm_driver/gcm_client_factory.h"
@@ skipping 126 matching lines @@
     : profile_(profile),
       push_messaging_service_(this, profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_ = CreateGCMDriverDesktop(
       gcm_client_factory.Pass(),
       profile_->GetPrefs(),
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext());
 
-#if defined(OS_CHROMEOS)
-  chromeos_connection_observer_.reset(new gcm::ChromeOSGCMConnectionObserver);
-  driver_->AddConnectionObserver(chromeos_connection_observer_.get());
-#endif
-
   identity_observer_.reset(new IdentityObserver(profile, driver_.get()));
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService()
     : profile_(NULL),
       push_messaging_service_(this, NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
 }
 
 void GCMProfileService::Shutdown() {
 #if !defined(OS_ANDROID)
   identity_observer_.reset();
 #endif  // !defined(OS_ANDROID)
   if (driver_) {
-#if defined(OS_CHROMEOS)
-    driver_->RemoveConnectionObserver(chromeos_connection_observer_.get());
-    chromeos_connection_observer_.reset();
-#endif
     driver_->Shutdown();
     driver_.reset();
   }
 }
 
 std::string GCMProfileService::SignedInUserName() const {
 #if defined(OS_ANDROID)
   return std::string();
 #else
   return identity_observer_ ? identity_observer_->SignedInUserName()
                             : std::string();
 #endif  // defined(OS_ANDROID)
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 #if !defined(OS_ANDROID)
   if (identity_observer_)
     identity_observer_.reset(new IdentityObserver(profile_, driver));
 #endif  // !defined(OS_ANDROID)
 }
 
 }  // namespace gcm