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

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

Issue 345803002: Move GoogleImageSearchSource() from template_url.cc to UIThreadSearchTermsData (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: No ChromeSearchTermsData, remove DCHECK, add comment 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/autocomplete/autocomplete_input.h" 10 #include "chrome/browser/autocomplete/autocomplete_input.h"
(...skipping 16 matching lines...) Expand all
27 using base::ASCIIToUTF16; 27 using base::ASCIIToUTF16;
28 28
29 // TestSearchTermsData -------------------------------------------------------- 29 // TestSearchTermsData --------------------------------------------------------
30 30
31 // Simple implementation of SearchTermsData. 31 // Simple implementation of SearchTermsData.
32 class TestSearchTermsData : public SearchTermsData { 32 class TestSearchTermsData : public SearchTermsData {
33 public: 33 public:
34 explicit TestSearchTermsData(const std::string& google_base_url); 34 explicit TestSearchTermsData(const std::string& google_base_url);
35 35
36 virtual std::string GoogleBaseURLValue() const OVERRIDE; 36 virtual std::string GoogleBaseURLValue() const OVERRIDE;
37 virtual std::string GoogleImageSearchSource() const OVERRIDE;
37 38
38 private: 39 private:
39 std::string google_base_url_; 40 std::string google_base_url_;
40 41
41 DISALLOW_COPY_AND_ASSIGN(TestSearchTermsData); 42 DISALLOW_COPY_AND_ASSIGN(TestSearchTermsData);
42 }; 43 };
43 44
44 TestSearchTermsData::TestSearchTermsData(const std::string& google_base_url) 45 TestSearchTermsData::TestSearchTermsData(const std::string& google_base_url)
45 : google_base_url_(google_base_url) { 46 : google_base_url_(google_base_url) {
46 } 47 }
47 48
48 std::string TestSearchTermsData::GoogleBaseURLValue() const { 49 std::string TestSearchTermsData::GoogleBaseURLValue() const {
49 return google_base_url_; 50 return google_base_url_;
50 } 51 }
51 52
53 std::string TestSearchTermsData::GoogleImageSearchSource() const {
54 return "google_image_search_source";
55 }
56
52 // TemplateURLTest ------------------------------------------------------------ 57 // TemplateURLTest ------------------------------------------------------------
53 58
54 class TemplateURLTest : public testing::Test { 59 class TemplateURLTest : public testing::Test {
55 public: 60 public:
56 TemplateURLTest() : search_terms_data_(NULL) {} 61 TemplateURLTest() : search_terms_data_(NULL) {}
57 void CheckSuggestBaseURL(const std::string& base_url, 62 void CheckSuggestBaseURL(const std::string& base_url,
58 const std::string& base_suggest_url) const; 63 const std::string& base_suggest_url) const;
59 64
60 UIThreadSearchTermsData search_terms_data_; 65 UIThreadSearchTermsData search_terms_data_;
61 }; 66 };
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 for (; j != replacements.end(); ++j) { 243 for (; j != replacements.end(); ++j) {
239 if (j->is_post_param && j->index == 244 if (j->is_post_param && j->index ==
240 static_cast<size_t>(i - post_params.begin())) { 245 static_cast<size_t>(i - post_params.begin())) {
241 switch (j->type) { 246 switch (j->type) {
242 case TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_WIDTH: 247 case TemplateURLRef::GOOGLE_IMAGE_ORIGINAL_WIDTH:
243 EXPECT_EQ("width", i->first); 248 EXPECT_EQ("width", i->first);
244 EXPECT_EQ( 249 EXPECT_EQ(
245 base::IntToString(search_args.image_original_size.width()), 250 base::IntToString(search_args.image_original_size.width()),
246 i->second); 251 i->second);
247 break; 252 break;
253 case TemplateURLRef::GOOGLE_IMAGE_SEARCH_SOURCE:
254 EXPECT_EQ("sbisrc", i->first);
255 EXPECT_EQ(search_terms_data.GoogleImageSearchSource(), i->second);
256 break;
248 case TemplateURLRef::GOOGLE_IMAGE_THUMBNAIL: 257 case TemplateURLRef::GOOGLE_IMAGE_THUMBNAIL:
249 EXPECT_EQ("image_content", i->first); 258 EXPECT_EQ("image_content", i->first);
250 EXPECT_EQ(search_args.image_thumbnail_content, i->second); 259 EXPECT_EQ(search_args.image_thumbnail_content, i->second);
251 break; 260 break;
252 case TemplateURLRef::GOOGLE_IMAGE_URL: 261 case TemplateURLRef::GOOGLE_IMAGE_URL:
253 EXPECT_EQ("image_url", i->first); 262 EXPECT_EQ("image_url", i->first);
254 EXPECT_EQ(search_args.image_url.spec(), i->second); 263 EXPECT_EQ(search_args.image_url.spec(), i->second);
255 break; 264 break;
256 case TemplateURLRef::LANGUAGE: 265 case TemplateURLRef::LANGUAGE:
257 EXPECT_EQ("language", i->first); 266 EXPECT_EQ("language", i->first);
(...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1468 search_terms_data_); 1477 search_terms_data_);
1469 EXPECT_EQ("http://bar/_/contextualsearch?" 1478 EXPECT_EQ("http://bar/_/contextualsearch?"
1470 "ctxs=1&" 1479 "ctxs=1&"
1471 "ctxs_start=6&" 1480 "ctxs_start=6&"
1472 "ctxs_end=11&" 1481 "ctxs_end=11&"
1473 "q=allen&" 1482 "q=allen&"
1474 "ctxs_content=woody+allen+movies&" 1483 "ctxs_content=woody+allen+movies&"
1475 "ctxs_url=www.wikipedia.org&" 1484 "ctxs_url=www.wikipedia.org&"
1476 "ctxs_encoding=utf-8&", result); 1485 "ctxs_encoding=utf-8&", result);
1477 } 1486 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698