sync: don't make DataTypeErrorHandler inherit UnrecoverableErrorHandler

chrome/browser/sync/glue/theme_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/theme_change_processor.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 29 matching lines @@
   DCHECK(running());
   DCHECK(profile_);
   DCHECK(type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
 
   sync_api::WriteTransaction trans(FROM_HERE, share_handle());
   sync_api::WriteNode node(&trans);
   if (node.InitByClientTagLookup(syncable::THEMES,
                                  kCurrentThemeClientTag) !=
           sync_api::BaseNode::INIT_OK) {
     std::string err = "Could not create node with client tag: ";
-    error_handler()->OnUnrecoverableError(FROM_HERE,
+    error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
                                           err + kCurrentThemeClientTag);
     return;
   }
 
   sync_pb::ThemeSpecifics old_theme_specifics = node.GetThemeSpecifics();
   // Make sure to base new_theme_specifics on old_theme_specifics so
   // we preserve the state of use_system_theme_by_default.
   sync_pb::ThemeSpecifics new_theme_specifics = old_theme_specifics;
   GetThemeSpecificsFromCurrentTheme(profile_, &new_theme_specifics);
   // Do a write only if something actually changed so as to guard
@@ skipping 24 matching lines @@
   if (change_count > 1u) {
     LOG(WARNING) << change_count << " theme changes detected; "
                  << "only applying the last one";
   }
   const sync_api::ChangeRecord& change =
       changes.Get()[change_count - 1];
   if (change.action != sync_api::ChangeRecord::ACTION_UPDATE &&
       change.action != sync_api::ChangeRecord::ACTION_DELETE) {
     std::string err = "strange theme change.action " +
         base::IntToString(change.action);
-    error_handler()->OnUnrecoverableError(FROM_HERE, err);
+    error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE, err);
     return;
   }
   sync_pb::ThemeSpecifics theme_specifics;
   // If the action is a delete, simply use the default values for
   // ThemeSpecifics, which would cause the default theme to be set.
   if (change.action != sync_api::ChangeRecord::ACTION_DELETE) {
     sync_api::ReadNode node(trans);
     if (node.InitByIdLookup(change.id) != sync_api::BaseNode::INIT_OK) {
       error_handler()->OnSingleDatatypeUnrecoverableError(FROM_HERE,
           "Theme node lookup failed.");
@@ skipping 27 matching lines @@
           ThemeServiceFactory::GetForProfile(profile_)));
 }
 
 void ThemeChangeProcessor::StopObserving() {
   DCHECK(profile_);
   DVLOG(1) << "Unobserving all notifications";
   notification_registrar_.RemoveAll();
 }
 
 }  // namespace browser_sync