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

chrome/browser/ui/search/search_ipc_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 59 matching lines @@
     virtual void OnLogMostVisitedNavigation(int position,
                                             const base::string16& provider) = 0;
 
     // Called when the page wants to paste the |text| (or the clipboard contents
     // if the |text| is empty) into the omnibox.
     virtual void PasteIntoOmnibox(const base::string16& text) = 0;
 
     // Called when the SearchBox wants to verify the signed-in Chrome identity
     // against the provided |identity|. Will make a round-trip to the browser
     // and eventually return the result through SendChromeIdentityCheckResult.
-    // Calls SendChromeIdentityCheckResult with true if both the identity
-    // matches and the user syncs their history.
-    // TODO(beaudoin): Change this function name and related APIs now that it's
-    // checking both the identity and the user's sync state.
+    // Calls SendChromeIdentityCheckResult with true if the identity matches.
     virtual void OnChromeIdentityCheck(const base::string16& identity) = 0;
+
+    // Called when the SearchBox wants to verify the signed-in Chrome identity
+    // against the provided |identity|. Will make a round-trip to the browser
+    // and eventually return the result through SendHistorySyncCheckResult.
+    // Calls SendHistorySyncCheckResult with true if the user syncs their
+    // history.
+    virtual void OnHistorySyncCheck() = 0;
   };
 
   // An interface to be implemented by consumers of SearchIPCRouter objects to
   // decide whether to process the message received from the page, and vice
   // versa (decide whether to send messages to the page).
   class Policy {
    public:
     virtual ~Policy() {}
 
     // SearchIPCRouter calls these functions before sending/receiving messages
     // to/from the page.
     virtual bool ShouldProcessSetVoiceSearchSupport() = 0;
     virtual bool ShouldProcessFocusOmnibox(bool is_active_tab) = 0;
     virtual bool ShouldProcessNavigateToURL(bool is_active_tab) = 0;
     virtual bool ShouldProcessDeleteMostVisitedItem() = 0;
     virtual bool ShouldProcessUndoMostVisitedDeletion() = 0;
     virtual bool ShouldProcessUndoAllMostVisitedDeletions() = 0;
     virtual bool ShouldProcessLogEvent() = 0;
     virtual bool ShouldProcessPasteIntoOmnibox(bool is_active_tab) = 0;
     virtual bool ShouldProcessChromeIdentityCheck() = 0;
+    virtual bool ShouldProcessHistorySyncCheck() = 0;
     virtual bool ShouldSendSetPromoInformation() = 0;
     virtual bool ShouldSendSetDisplayInstantResults() = 0;
     virtual bool ShouldSendSetSuggestionToPrefetch() = 0;
     virtual bool ShouldSendSetOmniboxStartMargin() = 0;
     virtual bool ShouldSendSetInputInProgress(bool is_active_tab) = 0;
     virtual bool ShouldSendOmniboxFocusChanged() = 0;
     virtual bool ShouldSendMostVisitedItems() = 0;
     virtual bool ShouldSendThemeBackgroundInfo() = 0;
     virtual bool ShouldSendToggleVoiceSearch() = 0;
     virtual bool ShouldSubmitQuery() = 0;
   };
 
   SearchIPCRouter(content::WebContents* web_contents, Delegate* delegate,
                   scoped_ptr<Policy> policy);
   ~SearchIPCRouter() override;
 
   // Tells the SearchIPCRouter that a new page in an Instant process committed.
   void OnNavigationEntryCommitted();
 
   // Tells the renderer to determine if the page supports the Instant API, which
   // results in a call to OnInstantSupportDetermined() when the reply is
   // received.
   void DetermineIfPageSupportsInstant();
 
   // Tells the renderer about the result of the Chrome identity check.
   void SendChromeIdentityCheckResult(const base::string16& identity,
                                      bool identity_match);
 
+  // Tells the renderer whether the user syncs history.
+  void SendHistorySyncCheckResult(bool sync_history);
+
   // Tells the renderer information it needs to display promos.
   void SetPromoInformation(bool is_app_launcher_enabled);
 
   // Tells the renderer whether to display the Instant results.
   void SetDisplayInstantResults();
 
   // Tells the page the suggestion to be prefetched if any.
   void SetSuggestionToPrefetch(const InstantSuggestion& suggestion);
 
   // Tells the page the left margin of the omnibox. This is used by the page to
@@ skipping 59 matching lines @@
   void OnLogMostVisitedImpression(int page_seq_no,
                                   int position,
                                   const base::string16& provider) const;
   void OnLogMostVisitedNavigation(int page_seq_no,
                                   int position,
                                   const base::string16& provider) const;
   void OnPasteAndOpenDropDown(int page_seq_no,
                               const base::string16& text) const;
   void OnChromeIdentityCheck(int page_seq_no,
                              const base::string16& identity) const;
+  void OnHistorySyncCheck(int page_seq_no) const;
 
   // Used by unit tests to set a fake delegate.
   void set_delegate_for_testing(Delegate* delegate);
 
   // Used by unit tests.
   void set_policy_for_testing(scoped_ptr<Policy> policy);
 
   // Used by unit tests.
   Policy* policy_for_testing() const { return policy_.get(); }
 
   // Used by unit tests.
   int page_seq_no_for_testing() const { return commit_counter_; }
 
   Delegate* delegate_;
   scoped_ptr<Policy> policy_;
 
   // Holds the number of main frame commits executed in this tab. Used by the
   // SearchIPCRouter to ensure that delayed IPC replies are ignored.
   int commit_counter_;
 
   // Set to true, when the tab corresponding to |this| instance is active.
   bool is_active_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchIPCRouter);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_IPC_ROUTER_H_