Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: media 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/search/instant_search_prerenderer.h" 5 #include "chrome/browser/ui/search/instant_search_prerenderer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f"); 494 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f");
495 browser()->instant_controller()->OpenInstant(CURRENT_TAB, url); 495 browser()->instant_controller()->OpenInstant(CURRENT_TAB, url);
496 content::MockRenderProcessHost* process = 496 content::MockRenderProcessHost* process =
497 static_cast<content::MockRenderProcessHost*>( 497 static_cast<content::MockRenderProcessHost*>(
498 prerender_contents()->GetRenderViewHost()->GetProcess()); 498 prerender_contents()->GetRenderViewHost()->GetProcess());
499 const IPC::Message* message = process->sink().GetFirstMessageMatching( 499 const IPC::Message* message = process->sink().GetFirstMessageMatching(
500 ChromeViewMsg_SearchBoxSubmit::ID); 500 ChromeViewMsg_SearchBoxSubmit::ID);
501 ASSERT_TRUE(message); 501 ASSERT_TRUE(message);
502 502
503 // Verify the IPC message params. 503 // Verify the IPC message params.
504 Tuple2<base::string16, EmbeddedSearchRequestParams> params; 504 Tuple<base::string16, EmbeddedSearchRequestParams> params;
505 ChromeViewMsg_SearchBoxSubmit::Read(message, &params); 505 ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
506 EXPECT_EQ("foo", base::UTF16ToASCII(params.a)); 506 EXPECT_EQ("foo", base::UTF16ToASCII(get<0>(params)));
507 EXPECT_EQ("f", base::UTF16ToASCII(params.b.original_query)); 507 EXPECT_EQ("f", base::UTF16ToASCII(get<1>(params).original_query));
508 EXPECT_EQ("utf-8", base::UTF16ToASCII(params.b.input_encoding)); 508 EXPECT_EQ("utf-8", base::UTF16ToASCII(get<1>(params).input_encoding));
509 EXPECT_EQ("", base::UTF16ToASCII(params.b.rlz_parameter_value)); 509 EXPECT_EQ("", base::UTF16ToASCII(get<1>(params).rlz_parameter_value));
510 EXPECT_EQ("chrome...0", base::UTF16ToASCII(params.b.assisted_query_stats)); 510 EXPECT_EQ("chrome...0",
511 base::UTF16ToASCII(get<1>(params).assisted_query_stats));
511 } 512 }
512 #endif 513 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698