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

Side by Side Diff: components/search_engines/template_url_parser_unittest.cc

Issue 1349783006: Cleanup: Pass std::string as const reference if possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert third_party changes Created 5 years, 3 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/files/file_util.h" 5 #include "base/files/file_util.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/common/chrome_paths.h" 9 #include "chrome/common/chrome_paths.h"
10 #include "components/search_engines/search_terms_data.h" 10 #include "components/search_engines/search_terms_data.h"
11 #include "components/search_engines/template_url.h" 11 #include "components/search_engines/template_url.h"
12 #include "components/search_engines/template_url_parser.h" 12 #include "components/search_engines/template_url_parser.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using base::ASCIIToUTF16; 15 using base::ASCIIToUTF16;
16 16
17 // ParamFilterImpl ------------------------------------------------------------ 17 // ParamFilterImpl ------------------------------------------------------------
18 18
19 // Filters any param which as an occurrence of name_str_ in its name or an 19 // Filters any param which as an occurrence of name_str_ in its name or an
20 // occurrence of value_str_ in its value. 20 // occurrence of value_str_ in its value.
21 class ParamFilterImpl : public TemplateURLParser::ParameterFilter { 21 class ParamFilterImpl : public TemplateURLParser::ParameterFilter {
22 public: 22 public:
23 ParamFilterImpl(std::string name_str, std::string value_str); 23 ParamFilterImpl(const std::string& name_str, const std::string& value_str);
24 ~ParamFilterImpl() override; 24 ~ParamFilterImpl() override;
25 25
26 bool KeepParameter(const std::string& key, const std::string& value) override; 26 bool KeepParameter(const std::string& key, const std::string& value) override;
27 27
28 private: 28 private:
29 std::string name_str_; 29 std::string name_str_;
30 std::string value_str_; 30 std::string value_str_;
31 31
32 DISALLOW_COPY_AND_ASSIGN(ParamFilterImpl); 32 DISALLOW_COPY_AND_ASSIGN(ParamFilterImpl);
33 }; 33 };
34 34
35 ParamFilterImpl::ParamFilterImpl(std::string name_str, std::string value_str) 35 ParamFilterImpl::ParamFilterImpl(const std::string& name_str,
36 : name_str_(name_str), 36 const std::string& value_str)
37 value_str_(value_str) { 37 : name_str_(name_str), value_str_(value_str) {}
38 }
39 38
40 ParamFilterImpl::~ParamFilterImpl() { 39 ParamFilterImpl::~ParamFilterImpl() {
41 } 40 }
42 41
43 bool ParamFilterImpl::KeepParameter(const std::string& key, 42 bool ParamFilterImpl::KeepParameter(const std::string& key,
44 const std::string& value) { 43 const std::string& value) {
45 return (name_str_.empty() || key.find(name_str_) == std::string::npos) && 44 return (name_str_.empty() || key.find(name_str_) == std::string::npos) &&
46 (value_str_.empty() || value.find(value_str_) == std::string::npos); 45 (value_str_.empty() || value.find(value_str_) == std::string::npos);
47 } 46 }
48 47
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name()); 252 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name());
254 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement(SearchTermsData())); 253 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement(SearchTermsData()));
255 EXPECT_TRUE(template_url_->suggestions_url().empty()); 254 EXPECT_TRUE(template_url_->suggestions_url().empty());
256 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8", 255 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
257 template_url_->url()); 256 template_url_->url());
258 ASSERT_EQ(1U, template_url_->input_encodings().size()); 257 ASSERT_EQ(1U, template_url_->input_encodings().size());
259 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]); 258 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]);
260 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"), 259 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
261 template_url_->favicon_url()); 260 template_url_->favicon_url());
262 } 261 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698