Use GetPreferredDataTypes rather than GetActiveDataTypes when performing sync check for chrome sugg…

chrome/browser/ui/search/search_tab_helper.cc

 // Copyright 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/ui/search/search_tab_helper.h"
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
@@ skipping 105 matching lines @@
       UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Google", duration);
     } else {
       UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Other", duration);
     }
   } else {
     UMA_HISTOGRAM_TIMES("Tab.NewTabOnload.Local", duration);
   }
   core_tab_helper->set_new_tab_start_time(base::TimeTicks());
 }
 
-// Returns true if the user is signed in and full history sync is enabled,
-// and false otherwise.
+// Returns true if the user's preference indicates he wants to sync history.

[Jered, 2015/02/19 16:01:38]

nit: reword this to "Returns true if the user wants to sync history" to avoid a
gendered pronoun.

[beaudoin, 2015/02/20 00:25:50]

Done.

+// This function returning true is not a guarantee that history is being synced,
+// but it can be used to disable a feature that should not be shown to users who
+// prefer not to sync their history.
 bool IsHistorySyncEnabled(Profile* profile) {
   ProfileSyncService* sync =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
   return sync &&
-      sync->SyncActive() &&

[Jered, 2015/02/19 16:01:38]

Did you mean to remove the call to SyncActive? The unit test still mocks it.

[beaudoin, 2015/02/20 00:25:50]

Yup, this is actually what was causing the problem. Removed from the unit test.

-      sync->GetActiveDataTypes().Has(syncer::HISTORY_DELETE_DIRECTIVES);
+      sync->GetPreferredDataTypes().Has(syncer::HISTORY_DELETE_DIRECTIVES);
 }
 
 bool OmniboxHasFocus(OmniboxView* omnibox) {
   return omnibox && omnibox->model()->has_focus();
 }
 
 }  // namespace
 
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
@@ skipping 445 matching lines @@
 
 bool SearchTabHelper::IsInputInProgress() const {
   OmniboxView* omnibox = GetOmniboxView();
   return !model_.mode().is_ntp() && omnibox &&
       omnibox->model()->focus_state() == OMNIBOX_FOCUS_VISIBLE;
 }
 
 OmniboxView* SearchTabHelper::GetOmniboxView() const {
   return delegate_ ? delegate_->GetOmniboxView() : NULL;
 }