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

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 49 matching lines @@
   MOCK_METHOD1(OnDeleteMostVisitedItem, void(const GURL& url));
   MOCK_METHOD1(OnUndoMostVisitedDeletion, void(const GURL& url));
   MOCK_METHOD0(OnUndoAllMostVisitedDeletions, void());
   MOCK_METHOD1(OnLogEvent, void(NTPLoggingEventType event));
   MOCK_METHOD2(OnLogMostVisitedImpression,
                void(int position, const base::string16& provider));
   MOCK_METHOD2(OnLogMostVisitedNavigation,
                void(int position, const base::string16& provider));
   MOCK_METHOD1(PasteIntoOmnibox, void(const base::string16&));
   MOCK_METHOD1(OnChromeIdentityCheck, void(const base::string16& identity));
+  MOCK_METHOD0(OnHistorySyncCheck, void());
 };
 
 }  // namespace
 
 class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     SearchTabHelper::CreateForWebContents(web_contents());
   }
 
   content::BrowserContext* CreateBrowserContext() override {
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               FakeSigninManagerBase::Build);
     builder.AddTestingFactory(
         ProfileSyncServiceFactory::GetInstance(),
         ProfileSyncServiceMock::BuildMockProfileSyncService);
     return builder.Build().release();
   }
 
   // Creates a sign-in manager for tests.  If |username| is not empty, the
   // testing profile of the WebContents will be connected to the given account.
-  // The account can be configured to |sync_history| or not.
-  void CreateSigninManager(const std::string& username, bool sync_history) {
+  void CreateSigninManager(const std::string& username) {
     SigninManagerBase* signin_manager = static_cast<SigninManagerBase*>(
         SigninManagerFactory::GetForProfile(profile()));
 
     if (!username.empty()) {
       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())
         .WillRepeatedly(Return(result));
@@ skipping 52 matching lines @@
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
   search_tab_helper->ipc_router().set_delegate_for_testing(mock_delegate());
   search_tab_helper->DetermineIfPageSupportsInstant();
   ASSERT_FALSE(MessageWasSent(
       ChromeViewMsg_DetermineIfPageSupportsInstant::ID));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
-  CreateSigninManager(std::string("foo@bar.com"), true);
+  CreateSigninManager(std::string("foo@bar.com"));
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
 
   const base::string16 test_identity = base::ASCIIToUTF16("foo@bar.com");
   search_tab_helper->OnChromeIdentityCheck(test_identity);
 
   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, params.a);
   ASSERT_TRUE(params.b);
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
-  CreateSigninManager(std::string("foo@bar.com"), true);
+  CreateSigninManager(std::string("foo@bar.com"));
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
 
   const base::string16 test_identity = base::ASCIIToUTF16("bar@foo.com");
   search_tab_helper->OnChromeIdentityCheck(test_identity);
 
   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, params.a);
   ASSERT_FALSE(params.b);
 }
 
-TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMatch) {
+TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   // This test does not sign in.
-  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);
 
-  const base::string16 test_identity;
+  const base::string16 test_identity = base::ASCIIToUTF16("bar@foo.com");
   search_tab_helper->OnChromeIdentityCheck(test_identity);
 
   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, params.a);
   ASSERT_FALSE(params.b);
 }
 
-TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
+TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncInactive) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
-  // This test does not sign in.
   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);
 
-  const base::string16 test_identity = base::ASCIIToUTF16("bar@foo.com");
-  search_tab_helper->OnChromeIdentityCheck(test_identity);
+  search_tab_helper->OnHistorySyncCheck();
 
   const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
-      ChromeViewMsg_ChromeIdentityCheckResult::ID);
+      ChromeViewMsg_HistorySyncCheckResult::ID);
   ASSERT_TRUE(message != NULL);
 
-  ChromeViewMsg_ChromeIdentityCheckResult::Param params;
-  ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, params.a);
-  ASSERT_FALSE(params.b);
+  ChromeViewMsg_HistorySyncCheckResult::Param params;
+  ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
+  ASSERT_FALSE(params.a);
 }
 
-TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatchNotSyncing) {
+TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
-  CreateSigninManager(std::string("foo@bar.com"), false);
+  SetHistorySync(true);
   SearchTabHelper* search_tab_helper =
       SearchTabHelper::FromWebContents(web_contents());
   ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);
 
-  const base::string16 test_identity = base::ASCIIToUTF16("foo@bar.com");
-  search_tab_helper->OnChromeIdentityCheck(test_identity);
+  search_tab_helper->OnHistorySyncCheck();
 
   const IPC::Message* message = process()->sink().GetUniqueMessageMatching(
-      ChromeViewMsg_ChromeIdentityCheckResult::ID);
+      ChromeViewMsg_HistorySyncCheckResult::ID);
   ASSERT_TRUE(message != NULL);
 
-  ChromeViewMsg_ChromeIdentityCheckResult::Param params;
-  ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);
-  EXPECT_EQ(test_identity, params.a);
-  ASSERT_FALSE(params.b);
+  ChromeViewMsg_HistorySyncCheckResult::Param params;
+  ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
+  ASSERT_TRUE(params.a);
+}
+
+TEST_F(SearchTabHelperTest, OnHistorySyncCheckNotSyncing) {
+  NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
+  SetHistorySync(false);
+  SearchTabHelper* search_tab_helper =
+      SearchTabHelper::FromWebContents(web_contents());
+  ASSERT_NE(static_cast<SearchTabHelper*>(NULL), search_tab_helper);

[dcheng, 2014/11/12 21:40:47]

ASSERT_NE(nullptr, search_tab_helper);

though it's even more concise (and preferred) to just say:

ASSERT(search_tab_helper);

Similar comment applies to line 285.

+
+  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(params.a);
 }
 
 class TabTitleObserver : public content::WebContentsObserver {
  public:
   explicit TabTitleObserver(content::WebContents* contents)
       : WebContentsObserver(contents) {}
 
   base::string16 title_on_start() { return title_on_start_; }
   base::string16 title_on_commit() { return title_on_commit_; }
 
@@ skipping 171 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());
 }