Update legacy Tuple-using code.

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 171 matching lines @@
 
   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);
+  EXPECT_EQ(test_identity, get<0>(params));
+  ASSERT_TRUE(get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckMismatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   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);
+  EXPECT_EQ(test_identity, get<0>(params));
+  ASSERT_FALSE(get<1>(params));
 }
 
 TEST_F(SearchTabHelperTest, OnChromeIdentityCheckSignedOutMismatch) {
   NavigateAndCommit(GURL(chrome::kChromeSearchLocalNtpUrl));
   // This test does not sign in.
   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);
+  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(params.a);
+  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(
       ChromeViewMsg_HistorySyncCheckResult::ID);
   ASSERT_TRUE(message != NULL);
 
   ChromeViewMsg_HistorySyncCheckResult::Param params;
   ChromeViewMsg_HistorySyncCheckResult::Read(message, &params);
-  ASSERT_TRUE(params.a);
+  ASSERT_TRUE(get<0>(params));
 }
 
 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);
 
   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);
+  ASSERT_FALSE(get<0>(params));
 }
 
 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());
 }