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

Side by Side Diff: chrome/browser/search_engines/template_url_unittest.cc

Issue 308053009: Add contextual search to the template url system (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments and make contextual search /search requests accessible from Java. Created 6 years, 6 months 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo")); 1351 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
1352 search_terms_args.session_token = "SESSIONTOKENGOESHERE"; 1352 search_terms_args.session_token = "SESSIONTOKENGOESHERE";
1353 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args); 1353 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1354 EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result); 1354 EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result);
1355 1355
1356 TemplateURL url2(NULL, data); 1356 TemplateURL url2(NULL, data);
1357 search_terms_args.session_token = ""; 1357 search_terms_args.session_token = "";
1358 result = url.url_ref().ReplaceSearchTerms(search_terms_args); 1358 result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1359 EXPECT_EQ("http://bar/search?q=foo&xssi=t", result); 1359 EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
1360 } 1360 }
1361
1362 TEST_F(TemplateURLTest, ContextualSearchParameters) {
1363 TemplateURLData data;
1364 UIThreadSearchTermsData::SetGoogleBaseURL("http://bar/");
1365 data.SetURL("http://bar/_/contextualsearch?"
1366 "{google:contextualSearchVersion}"
1367 "{google:contextualSearchStart}"
1368 "{google:contextualSearchEnd}"
1369 "{google:contextualSearchContent}"
1370 "{google:contextualSearchBasePageURL}"
1371 "{google:contextualSearchEncoding}");
1372
1373 TemplateURL url(NULL, data);
1374 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
1375 search_terms_args.contextual_search_params.version = 1;
1376 search_terms_args.contextual_search_params.start = 12;
1377 search_terms_args.contextual_search_params.end = 20;
1378 search_terms_args.contextual_search_params.content = "woody+allen+movies";
1379 search_terms_args.contextual_search_params.base_page_url =
1380 "www.wikipedia.org";
1381 search_terms_args.contextual_search_params.encoding = "utf-8";
1382 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1383
1384 EXPECT_EQ("http://bar/_/contextualsearch?"
1385 "ctxs=1"
1386 "&ctxs_start=12"
Peter Kasting 2014/06/04 00:40:49 Nit: Place ampersands on the ends of previous line
jeremycho 2014/06/04 21:49:35 Done.
1387 "&ctxs_end=20"
1388 "&ctxs_content=woody+allen+movies"
1389 "&ctxs_url=www.wikipedia.org"
1390 "&ctxs_encoding=utf-8&", result);
1391
1392 TemplateURL url2(NULL, data);
1393 search_terms_args.contextual_search_params.version = -1;
1394 search_terms_args.contextual_search_params.base_page_url = "";
1395 search_terms_args.contextual_search_params.encoding = "";
1396 result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1397 EXPECT_EQ("http://bar/_/contextualsearch?"
1398 "ctxs_start=12"
1399 "&ctxs_end=20"
1400 "&ctxs_content=woody+allen+movies&", result);
1401 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698