Move auth-error reporting code out of SyncGlobalError and into SigninGlobalError

chrome/browser/sync/profile_sync_service_harness.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/sync/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 103 matching lines @@
       waiting_for_status_change_(false) {
   if (IsSyncAlreadySetup()) {
     service_ = ProfileSyncServiceFactory::GetInstance()->GetForProfile(
         profile_);
     service_->AddObserver(this);
     ignore_result(TryListeningToMigrationEvents());
     wait_state_ = FULLY_SYNCED;
   }
 }
 
-ProfileSyncServiceHarness::~ProfileSyncServiceHarness() {}
+ProfileSyncServiceHarness::~ProfileSyncServiceHarness() {
+  if (service_->HasObserver(this))
+    service_->RemoveObserver(this);
+}
 
 // static
 ProfileSyncServiceHarness* ProfileSyncServiceHarness::CreateAndAttach(
     Profile* profile) {
   ProfileSyncServiceFactory* f = ProfileSyncServiceFactory::GetInstance();
   if (!f->HasProfileSyncService(profile)) {
     NOTREACHED() << "Profile has never signed into sync.";
     return NULL;
   }
   return new ProfileSyncServiceHarness(profile, "", "");
@@ skipping 987 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service_));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }