[Sync] Add interface and backend impl for typed URL syncable service

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 15 matching lines @@
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
 #include "chrome/browser/history/download_row.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/select_favicon_frames.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/typed_url_syncable_service.h"
 #include "chrome/browser/history/visit_filter.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "sql/error_delegate_util.h"
 
@@ skipping 243 matching lines @@
 
 #if defined(OS_ANDROID)
   file_util::Delete(GetAndroidCacheFileName(), false);
 #endif
 }
 
 void HistoryBackend::Init(const std::string& languages, bool force_fail) {
   if (!force_fail)
     InitImpl(languages);
   delegate_->DBLoaded(id_);
+  typed_url_syncable_service_.reset(new TypedUrlSyncableService(this));
 }
 
 void HistoryBackend::SetOnBackendDestroyTask(MessageLoop* message_loop,
                                              const base::Closure& task) {
   if (!backend_destroy_task_.is_null())
     DLOG(WARNING) << "Setting more than one destroy task, overriding";
   backend_destroy_message_loop_ = message_loop;
   backend_destroy_task_ = task;
 }
 
@@ skipping 573 matching lines @@
   NotifyVisitObservers(visit_info);
 
   if (visit_info.visit_time < first_recorded_time_)
     first_recorded_time_ = visit_info.visit_time;
 
   // Broadcast a notification of the visit.
   if (visit_id) {
     URLVisitedDetails* details = new URLVisitedDetails;
     details->transition = transition;
     details->row = url_info;
+
+    // Notify typed url sync

[Andrew T Wilson (Slow), 2013/04/09 12:48:30]

nit: use sentence punctuation.

+    if (typed_url_syncable_service_.get()) {

[Andrew T Wilson (Slow), 2013/04/09 12:48:30]

nit: omit braces on single-line if statements, because that seems to be the
consistent standard in this file.

+      typed_url_syncable_service_->OnUrlVisited(details);
+    }
     // TODO(meelapshah) Disabled due to potential PageCycler regression.
     // Re-enable this.
     // GetMostRecentRedirectsTo(url, &details->redirects);
     BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URL_VISITED, details);
   } else {
     VLOG(0) << "Failed to build visit insert statement:  "
             << "url_id = " << url_id;
   }
 
   return std::make_pair(url_id, visit_id);
@@ skipping 71 matching lines @@
         NOTREACHED() << "Adding visit failed.";
         return;
       }
       NotifyVisitObservers(visit_info);
 
       if (visit_info.visit_time < first_recorded_time_)
         first_recorded_time_ = visit_info.visit_time;
     }
   }
 
+  // Notify typed url sync

[Andrew T Wilson (Slow), 2013/04/09 12:48:30]

Nit: use sentence punctuation (here and below).

+  if (typed_url_syncable_service_.get()) {
+    typed_url_syncable_service_->OnUrlsModified(modified.get());
+  }
+
   // Broadcast a notification for typed URLs that have been modified. This
   // will be picked up by the in-memory URL database on the main thread.
   //
   // TODO(brettw) bug 1140015: Add an "add page" notification so the history
   // views can keep in sync.
   BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                          modified.release());
 
   ScheduleCommit();
 }
@@ skipping 34 matching lines @@
   for (size_t i = 0; i < redirects->size(); i++) {
     URLRow row;
     URLID row_id = db_->GetRowForURL(redirects->at(i), &row);
     if (row_id && row.title() != title) {
       row.set_title(title);
       db_->UpdateURLRow(row_id, row);
       details->changed_urls.push_back(row);
     }
   }
 
+  // Notify typed url sync
+  if (typed_url_syncable_service_.get()) {
+    typed_url_syncable_service_->OnUrlsModified(details.get());
+  }
+
   // Broadcast notifications for any URLs that have changed. This will
   // update the in-memory database and the InMemoryURLIndex.
   if (!details->changed_urls.empty()) {
     BroadcastNotifications(chrome::NOTIFICATION_HISTORY_URLS_MODIFIED,
                            details.release());
     ScheduleCommit();
   }
 }
 
 void HistoryBackend::AddPageNoVisitForBookmark(const GURL& url,
@@ skipping 120 matching lines @@
       success = true;
 
       // Optionally query the visits.
       if (want_visits)
         db_->GetVisitsForURL(row->id(), visits);
     }
   }
   request->ForwardResult(request->handle(), success, row, visits);
 }
 
+TypedUrlSyncableService* HistoryBackend::GetTypedUrlSyncableService() const {
+  return typed_url_syncable_service_.get();
+}
+
 // Segment usage ---------------------------------------------------------------
 
 void HistoryBackend::DeleteOldSegmentData() {
   if (db_.get())
     db_->DeleteSegmentData(Time::Now() -
                            TimeDelta::FromDays(kSegmentDataRetention));
 }
 
 void HistoryBackend::QuerySegmentUsage(
     scoped_refptr<QuerySegmentUsageRequest> request,
@@ skipping 1666 matching lines @@
   if (!task_scheduled) {
     // No other tasks are scheduled. Process request now.
     ProcessDBTaskImpl();
   }
 }
 
 void HistoryBackend::BroadcastNotifications(
     int type,
     HistoryDetails* details_deleted) {
   // |delegate_| may be NULL if |this| is in the process of closing (closed by
-  // HistoryService -> HistroyBackend::Closing().
-  if (delegate_.get())
+  // HistoryService -> HistoryBackend::Closing().
+  if (delegate_.get()) {
+    // Typed urls sync service is called here to handle deleted urls, including
+    // expirations from ExpireHistoryBackend. New and visited url handling is
+    // called separately.
+    if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED &&

[Andrew T Wilson (Slow), 2013/04/09 12:48:30]

It seems weird that we're doing deletions via BroadcastNotifications, but
adds/modifies. Why is this? Why not put all of the logic for notifying
typed_url_syncable_service in this function (or else have ExpireHistoryBackend
notify typed_url_syncable_service directly)?

+        typed_url_syncable_service_.get()) {
+      typed_url_syncable_service_->OnUrlsDeleted(
+          static_cast<history::URLsDeletedDetails*>(details_deleted));
+    }
     delegate_->BroadcastNotifications(type, details_deleted);
-  else
+  } else {
     delete details_deleted;
+  }
 }
 
 // Deleting --------------------------------------------------------------------
 
 void HistoryBackend::DeleteAllHistory() {
   // Our approach to deleting all history is:
   //  1. Copy the bookmarks and their dependencies to new tables with temporary
   //     names.
   //  2. Delete the original tables. Since tables can not share pages, we know
   //     that any data we don't want to keep is now in an unused page.
@@ skipping 183 matching lines @@
   info.url_id = visit.url_id;
   info.time = visit.visit_time;
   info.transition = visit.transition;
   // If we don't have a delegate yet during setup or shutdown, we will drop
   // these notifications.
   if (delegate_.get())
     delegate_->NotifyVisitDBObserversOnAddVisit(info);
 }
 
 }  // namespace history