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

Use GetPreferredDataTypes rather than GetActiveDataTypes when performing sync check for chrome suggestions. This ensure we do not clear Chrome Suggestions when the sync service is starting up and not yet active, unless the user explicitely indicated he didn't want to sync history.

BUG=459729
Committed: https://crrev.com/6c7b230f0f6abb2d2b939c633aa81b3a2092a198
Cr-Commit-Position: refs/heads/master@{#317346}

[beaudoin, 2015-02-19 15:51:11]

beaudoin@chromium.org changed reviewers:
+ jered@chromium.org

[beaudoin, 2015-02-19 15:51:37]

Hi Jered,

Trivial change to fix a bug at startup with chrome suggestions.

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

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
File chrome/browser/ui/search/search_tab_helper.cc (left):

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
chrome/browser/ui/search/search_tab_helper.cc:132: sync->SyncActive() &&
Did you mean to remove the call to SyncActive? The unit test still mocks it.

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
File chrome/browser/ui/search/search_tab_helper.cc (right):

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
chrome/browser/ui/search/search_tab_helper.cc:126: // Returns true if the user's
preference indicates he wants to sync history.
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]

Modified test, PTAL.

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
File chrome/browser/ui/search/search_tab_helper.cc (left):

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
chrome/browser/ui/search/search_tab_helper.cc:132: sync->SyncActive() &&
On 2015/02/19 16:01:38, Jered wrote:
> Did you mean to remove the call to SyncActive? The unit test still mocks it.

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

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
File chrome/browser/ui/search/search_tab_helper.cc (right):

https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
chrome/browser/ui/search/search_tab_helper.cc:126: // Returns true if the user's
preference indicates he wants to sync history.
On 2015/02/19 16:01:38, Jered wrote:
> nit: reword this to "Returns true if the user wants to sync history" to avoid
a
> gendered pronoun.

Done.

[Jered, 2015-02-20 16:55:11]

On 2015/02/20 00:25:50, beaudoin wrote:
> Modified test, PTAL.
> 
>
https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
> File chrome/browser/ui/search/search_tab_helper.cc (left):
> 
>
https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
> chrome/browser/ui/search/search_tab_helper.cc:132: sync->SyncActive() &&
> On 2015/02/19 16:01:38, Jered wrote:
> > Did you mean to remove the call to SyncActive? The unit test still mocks it.
> 
> Yup, this is actually what was causing the problem. Removed from the unit
test.
> 
>
https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
> File chrome/browser/ui/search/search_tab_helper.cc (right):
> 
>
https://codereview.chromium.org/940043002/diff/1/chrome/browser/ui/search/sea...
> chrome/browser/ui/search/search_tab_helper.cc:126: // Returns true if the
user's
> preference indicates he wants to sync history.
> On 2015/02/19 16:01:38, Jered wrote:
> > nit: reword this to "Returns true if the user wants to sync history" to
avoid
> a
> > gendered pronoun.
> 
> Done.

lgtm

[beaudoin, 2015-02-20 16:56:23]

The CQ bit was checked by beaudoin@chromium.org

[commit-bot: I haz the power, 2015-02-20 16:57:07]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/940043002/40001

[commit-bot: I haz the power, 2015-02-20 17:47:54]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-02-20 17:48:20]

Patchset 3 (id:??) landed as
https://crrev.com/6c7b230f0f6abb2d2b939c633aa81b3a2092a198
Cr-Commit-Position: refs/heads/master@{#317346}