chrome/browser/ui/search/search_tab_helper_unittest.cc - Issue 821453003: Update legacy Tuple-using code.

Unified Diff: chrome/browser/ui/search/search_tab_helper_unittest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/search/search_ipc_router_unittest.cc ('k') | chrome/renderer/autofill/autofill_renderer_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ffd587eca38920ce9053143c0bf77687fb39020a..0264ae2118037290355e275194633a6cae08ef2a 100644

--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc

+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc

@@ -189,8 +189,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMatch) {

ChromeViewMsg_ChromeIdentityCheckResult::Param params;

ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);

- EXPECT_EQ(test_identity, params.a);

- ASSERT_TRUE(params.b);

+ EXPECT_EQ(test_identity, get<0>(params));

+ ASSERT_TRUE(get<1>(params));

}

TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {

@@ -209,8 +209,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {

ChromeViewMsg_ChromeIdentityCheckResult::Param params;

ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);

- EXPECT_EQ(test_identity, params.a);

- ASSERT_FALSE(params.b);

+ EXPECT_EQ(test_identity, get<0>(params));

+ ASSERT_FALSE(get<1>(params));

}

TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {

@@ -229,8 +229,8 @@ TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {

ChromeViewMsg_ChromeIdentityCheckResult::Param params;

ChromeViewMsg_ChromeIdentityCheckResult::Read(message, &params);

- EXPECT_EQ(test_identity, params.a);

- ASSERT_FALSE(params.b);

+ EXPECT_EQ(test_identity, get<0>(params));

+ ASSERT_FALSE(get<1>(params));

}

TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncInactive) {

@@ -250,7 +250,7 @@ TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncInactive) {

ChromeViewMsg_HistorySyncCheckResult::Param params;

ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);

- ASSERT_FALSE(params.a);

+ ASSERT_FALSE(get<0>(params));

}

TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {

@@ -268,7 +268,7 @@ TEST_F(SearchTabHelperTest, OnHistorySyncCheckSyncing) {

ChromeViewMsg_HistorySyncCheckResult::Param params;

ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);

- ASSERT_TRUE(params.a);

+ ASSERT_TRUE(get<0>(params));

}

TEST_F(SearchTabHelperTest, OnHistorySyncCheckNotSyncing) {

@@ -286,7 +286,7 @@ TEST_F(SearchTabHelperTest, OnHistorySyncCheckNotSyncing) {

ChromeViewMsg_HistorySyncCheckResult::Param params;

ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);

- ASSERT_FALSE(params.a);

+ ASSERT_FALSE(get<0>(params));

}

class TabTitleObserver : public content::WebContentsObserver {