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

chrome/browser/ui/search/search_tab_helper_unittest.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_tab_helper.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 88 matching lines @@
       ASSERT_TRUE(signin_manager);
       signin_manager->SetAuthenticatedUsername(username);
     }
   }
 
   // Configure the account to |sync_history| or not.
   void SetHistorySync(bool sync_history) {
     ProfileSyncServiceMock* sync_service = static_cast<ProfileSyncServiceMock*>(
         ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile()));
 
-    EXPECT_CALL(*sync_service, SyncActive()).WillRepeatedly(Return(true));
     syncer::ModelTypeSet result;
     if (sync_history) {
       result.Put(syncer::HISTORY_DELETE_DIRECTIVES);
     }
-    EXPECT_CALL(*sync_service, GetActiveDataTypes())
+    EXPECT_CALL(*sync_service, GetPreferredDataTypes())
         .WillRepeatedly(Return(result));
   }
 
   bool MessageWasSent(uint32 id) {
     return process()->sink().GetFirstMessageMatching(id) != NULL;
   }
 
   MockSearchIPCRouterDelegate* mock_delegate() { return &delegate_; }
 
  private:
@@ skipping 148 matching lines @@
   const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
       ChromeViewMsg_ChromeIdentityCheckResult::ID);
   ASSERT_TRUE(message != NULL);
 
   ChromeViewMsg_ChromeIdentityCheckResult::Param params;
   ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
   EXPECT_EQ(test_identity, get<0>(params));
   ASSERT_FALSE(get<1>(params));
 }
 
-TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncInactive) {
-  NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
-  ProfileSyncServiceMock* sync_service = static_cast<ProfileSyncServiceMock*>(
-      ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile()));
-  EXPECT_CALL(*sync_service, SyncActive()).WillRepeatedly(Return(false));
-  SearchTabHelper* search_tab_helper =
-      SearchTabHelper::FromWebContents(web_contents());
-  ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
-
-  search_tab_helper->OnHistorySyncCheck();
-
-  const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
-      ChromeViewMsg_HistorySyncCheckResult::ID);
-  ASSERT_TRUE(message != NULL);
-
-  ChromeViewMsg_HistorySyncCheckResult::Param params;
-  ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
-  ASSERT_FALSE(get<0>(params));
-}
-
 TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   SetHistorySync(true);
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
 
   search_tab_helper->OnHistorySyncCheck();
 
   const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
@@ skipping 143 matching lines @@
 }
 
 TEST_F(SearchTabHelperPrerenderTest,
     OnTabActivatedNoPrerenderIfOmniboxBlurred) {
   SearchTabHelperPrerenderTest::omnibox_has_focus_ = false;
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   search_tab_helper->OnTabActivated();
   ASSERT_FALSE(IsInstantURLMarkedForPrerendering());
 }