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

Index: chrome/browser/ui/search/search_tab_helper_unittest.cc
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index 449873793e57877464912c19c11d67054b50d45e..ffd587eca38920ce9053143c0bf77687fb39020a 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -67,6 +67,7 @@ class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
                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
@@ -90,8 +91,7 @@ class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
 
   // 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()));
 
@@ -99,7 +99,10 @@ class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
       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()));
 
@@ -172,7 +175,7 @@ TEST_F(SearchTabHelperTest, PageURLDoesntBelongToInstantRenderer) {
 
 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);
@@ -192,7 +195,7 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatch) {
 
 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);
@@ -210,17 +213,14 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {
   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(
@@ -233,9 +233,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMatch) {
   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));
@@ -243,37 +242,51 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
       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 {