Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2608)

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.cc

Issue 10140012: Ignore errors from more callsites of FixupURLAndGetVisits(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comment per review feedback. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
}
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698