sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

chrome/browser/sync/glue/generic_change_processor.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/glue/generic_change_processor.h"
 
 #include "base/location.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 39 matching lines @@
       syncer_changes_.push_back(
           SyncChange(SyncChange::ACTION_DELETE,
                      SyncData::CreateRemoteData(it->id, it->specifics)));
     } else {
       SyncChange::SyncChangeType action =
           (it->action == sync_api::ChangeRecord::ACTION_ADD) ?
           SyncChange::ACTION_ADD : SyncChange::ACTION_UPDATE;
       // Need to load specifics from node.
       sync_api::ReadNode read_node(trans);
       if (read_node.InitByIdLookup(it->id) != sync_api::BaseNode::INIT_OK) {
-        error_handler()->OnUnrecoverableError(
+        error_handler()->OnSingleDatatypeUnrecoverableError(
             FROM_HERE,
             "Failed to look up data for received change with id " +
                 base::Int64ToString(it->id));
         return;
       }
       syncer_changes_.push_back(
           SyncChange(action,
                      SyncData::CreateRemoteData(
                          it->id, read_node.GetEntitySpecifics())));
     }
   }
 }
 
 void GenericChangeProcessor::CommitChangesFromSyncModel() {
   DCHECK(CalledOnValidThread());
   if (!running())
     return;
   if (syncer_changes_.empty())
     return;
   if (!local_service_) {
     syncable::ModelType type = syncer_changes_[0].sync_data().GetDataType();
     SyncError error(FROM_HERE, "Local service destroyed.", type);
-    error_handler()->OnUnrecoverableError(error.location(), error.message());
+    error_handler()->OnSingleDatatypeUnrecoverableError(error.location(),
+                                                        error.message());
     return;
   }
   SyncError error = local_service_->ProcessSyncChanges(FROM_HERE,
                                                        syncer_changes_);
   syncer_changes_.clear();
   if (error.IsSet()) {
     error_handler()->OnSingleDatatypeUnrecoverableError(
         error.location(), error.message());
   }
 }
@@ skipping 377 matching lines @@
 void GenericChangeProcessor::StopImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 sync_api::UserShare* GenericChangeProcessor::share_handle() const {
   DCHECK(CalledOnValidThread());
   return share_handle_;
 }
 
 }  // namespace browser_sync