| OLD | NEW |
| 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 <stdint.h> | 7 #include <stdint.h> |
| 8 #include <tuple> |
| 8 | 9 |
| 9 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 10 #include "base/macros.h" | 11 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/metrics/field_trial.h" | 13 #include "base/metrics/field_trial.h" |
| 13 #include "base/strings/string16.h" | 14 #include "base/strings/string16.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 15 #include "build/build_config.h" | 16 #include "build/build_config.h" |
| 16 #include "chrome/browser/prerender/prerender_contents.h" | 17 #include "chrome/browser/prerender/prerender_contents.h" |
| 17 #include "chrome/browser/prerender/prerender_handle.h" | 18 #include "chrome/browser/prerender/prerender_handle.h" |
| (...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 526 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f"); | 527 GURL url("https://www.google.com/url?bar=foo&aqs=chrome...0&ie=utf-8&oq=f"); |
| 527 browser()->instant_controller()->OpenInstant(CURRENT_TAB, url); | 528 browser()->instant_controller()->OpenInstant(CURRENT_TAB, url); |
| 528 content::MockRenderProcessHost* process = | 529 content::MockRenderProcessHost* process = |
| 529 static_cast<content::MockRenderProcessHost*>( | 530 static_cast<content::MockRenderProcessHost*>( |
| 530 prerender_contents()->GetRenderViewHost()->GetProcess()); | 531 prerender_contents()->GetRenderViewHost()->GetProcess()); |
| 531 const IPC::Message* message = process->sink().GetFirstMessageMatching( | 532 const IPC::Message* message = process->sink().GetFirstMessageMatching( |
| 532 ChromeViewMsg_SearchBoxSubmit::ID); | 533 ChromeViewMsg_SearchBoxSubmit::ID); |
| 533 ASSERT_TRUE(message); | 534 ASSERT_TRUE(message); |
| 534 | 535 |
| 535 // Verify the IPC message params. | 536 // Verify the IPC message params. |
| 536 base::Tuple<base::string16, EmbeddedSearchRequestParams> params; | 537 std::tuple<base::string16, EmbeddedSearchRequestParams> params; |
| 537 ChromeViewMsg_SearchBoxSubmit::Read(message, ¶ms); | 538 ChromeViewMsg_SearchBoxSubmit::Read(message, ¶ms); |
| 538 EXPECT_EQ("foo", base::UTF16ToASCII(base::get<0>(params))); | 539 EXPECT_EQ("foo", base::UTF16ToASCII(std::get<0>(params))); |
| 539 EXPECT_EQ("f", base::UTF16ToASCII(base::get<1>(params).original_query)); | 540 EXPECT_EQ("f", base::UTF16ToASCII(std::get<1>(params).original_query)); |
| 540 EXPECT_EQ("utf-8", base::UTF16ToASCII(base::get<1>(params).input_encoding)); | 541 EXPECT_EQ("utf-8", base::UTF16ToASCII(std::get<1>(params).input_encoding)); |
| 541 EXPECT_EQ("", base::UTF16ToASCII(base::get<1>(params).rlz_parameter_value)); | 542 EXPECT_EQ("", base::UTF16ToASCII(std::get<1>(params).rlz_parameter_value)); |
| 542 EXPECT_EQ("chrome...0", | 543 EXPECT_EQ("chrome...0", |
| 543 base::UTF16ToASCII(base::get<1>(params).assisted_query_stats)); | 544 base::UTF16ToASCII(std::get<1>(params).assisted_query_stats)); |
| 544 } | 545 } |
| 545 #endif | 546 #endif |
| OLD | NEW |