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

chrome/browser/ui/search/search_tab_helper.cc

Index: chrome/browser/ui/search/search_tab_helper.cc
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
index f2c34e773db558c7707628ad85ec8b24ad71e745..25370cc01120bfc9a32b52a6418195cf8dc52879 100644
--- a/chrome/browser/ui/search/search_tab_helper.cc
+++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -564,14 +564,16 @@ void SearchTabHelper::OnChromeIdentityCheck(const base::string16& identity) {
   if (manager) {
     const base::string16 username =
         base::UTF8ToUTF16(manager->GetAuthenticatedUsername());
-    // The identity check only passes if the user is syncing 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.
-    bool matches = IsHistorySyncEnabled(profile()) && identity == username;
-    ipc_router_.SendChromeIdentityCheckResult(identity, matches);
+    ipc_router_.SendChromeIdentityCheckResult(identity, identity == username);
+  } else {
+    ipc_router_.SendChromeIdentityCheckResult(identity, false);
   }
 }
 
+void SearchTabHelper::OnHistorySyncCheck() {
+  ipc_router_.SendHistorySyncCheckResult(IsHistorySyncEnabled(profile()));
+}
+
 void SearchTabHelper::UpdateMode(bool update_origin, bool is_preloaded_ntp) {
   SearchMode::Type type = SearchMode::MODE_DEFAULT;
   SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;