Now CHECKs to make sure we log out before clearing the token db

chrome/browser/sync/glue/typed_url_model_associator.cc

Index: chrome/browser/sync/glue/typed_url_model_associator.cc
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc
index 1dd8279f0e79f5d49f4e1ec4915e0fc6a453b024..5717b5123c1c3fc2622f17666c6c592aa2cba0a0 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.cc
+++ b/chrome/browser/sync/glue/typed_url_model_associator.cc
@@ -376,10 +376,10 @@ SyncError TypedUrlModelAssociator::UpdateFromSyncDB(
     // merge them below.
     if (!FixupURLAndGetVisits(
             history_backend_, &new_url, &existing_visits)) {
-      return error_handler_->CreateAndUploadError(
-          FROM_HERE,
-          "UpdateFromSyncDB failed",
-          model_type());
+      // Couldn't load the visits for this URL due to some kind of DB error.
+      // Just treat this URL as if it were not an existing URL.
+      LOG(ERROR) << "Could not load visits for url: " << new_url.url();
+      existing_url = false;
     }
   }