Separate checking the user identity and checking if the user is syncing his history in two differen…

chrome/browser/ui/search/search_ipc_router.cc

 // Copyright 2013 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/ui/search/search_ipc_router.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 43 matching lines @@
 void SearchIPCRouter::SendChromeIdentityCheckResult(
     const base::string16& identity,
     bool identity_match) {
   if (!policy_->ShouldProcessChromeIdentityCheck())
     return;
 
   Send(new ChromeViewMsg_ChromeIdentityCheckResult(routing_id(), identity,
                                                    identity_match));
 }
 
+void SearchIPCRouter::SendHistorySyncCheckResult(bool sync_history) {
+  if (!policy_->ShouldProcessHistorySyncCheck())
+    return;
+
+  Send(new ChromeViewMsg_HistorySyncCheckResult(routing_id(), sync_history));
+}
+
 void SearchIPCRouter::SetPromoInformation(bool is_app_launcher_enabled) {
   if (!policy_->ShouldSendSetPromoInformation())
     return;
 
   Send(new ChromeViewMsg_SearchBoxPromoInformation(routing_id(),
                                                    is_app_launcher_enabled));
 }
 
 void SearchIPCRouter::SetDisplayInstantResults() {
   if (!policy_->ShouldSendSetDisplayInstantResults())
@@ skipping 99 matching lines @@
                         OnUndoMostVisitedDeletion);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions,
                         OnUndoAllMostVisitedDeletions);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_LogEvent, OnLogEvent);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_LogMostVisitedImpression,
                         OnLogMostVisitedImpression);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_LogMostVisitedNavigation,
                         OnLogMostVisitedNavigation);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PasteAndOpenDropdown,
                         OnPasteAndOpenDropDown);
+    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_HistorySyncCheck,
+                        OnHistorySyncCheck);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ChromeIdentityCheck,
                         OnChromeIdentityCheck);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SearchIPCRouter::OnInstantSupportDetermined(int page_seq_no,
                                                  bool instant_support) const {
   if (page_seq_no != commit_counter_)
@@ skipping 133 matching lines @@
   if (page_seq_no != commit_counter_)
     return;
 
   delegate_->OnInstantSupportDetermined(true);
   if (!policy_->ShouldProcessChromeIdentityCheck())
     return;
 
   delegate_->OnChromeIdentityCheck(identity);
 }
 
+void SearchIPCRouter::OnHistorySyncCheck(int page_seq_no) const {
+  if (page_seq_no != commit_counter_)
+    return;
+
+  delegate_->OnInstantSupportDetermined(true);
+  if (!policy_->ShouldProcessHistorySyncCheck())
+    return;
+
+  delegate_->OnHistorySyncCheck();
+}
+
 void SearchIPCRouter::set_delegate_for_testing(Delegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 }
 
 void SearchIPCRouter::set_policy_for_testing(scoped_ptr<Policy> policy) {
   DCHECK(policy.get());
   policy_.reset(policy.release());
 }