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

Side by Side Diff: components/search_engines/default_search_manager_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/scoped_temp_dir.h" 5 #include "base/files/scoped_temp_dir.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/strings/string_split.h" 7 #include "base/strings/string_split.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 "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 encodings->AppendString(*it); 111 encodings->AppendString(*it);
112 } 112 }
113 entry->Set(DefaultSearchManager::kInputEncodings, encodings.release()); 113 entry->Set(DefaultSearchManager::kInputEncodings, encodings.release());
114 114
115 entry->SetString(DefaultSearchManager::kSearchTermsReplacementKey, 115 entry->SetString(DefaultSearchManager::kSearchTermsReplacementKey,
116 data->search_terms_replacement_key); 116 data->search_terms_replacement_key);
117 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled); 117 entry->SetBoolean(DefaultSearchManager::kDisabledByPolicy, !enabled);
118 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release()); 118 prefs->SetManagedPref(kDefaultSearchProviderData, entry.release());
119 } 119 }
120 120
121 scoped_ptr<TemplateURLData> GenerateDummyTemplateURLData(std::string type) { 121 scoped_ptr<TemplateURLData> GenerateDummyTemplateURLData(
122 const std::string& type) {
122 scoped_ptr<TemplateURLData> data(new TemplateURLData()); 123 scoped_ptr<TemplateURLData> data(new TemplateURLData());
123 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name"))); 124 data->SetShortName(base::UTF8ToUTF16(std::string(type).append("name")));
124 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key"))); 125 data->SetKeyword(base::UTF8ToUTF16(std::string(type).append("key")));
125 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}")); 126 data->SetURL(std::string("http://").append(type).append("foo/{searchTerms}"));
126 data->suggestions_url = std::string("http://").append(type).append("sugg"); 127 data->suggestions_url = std::string("http://").append(type).append("sugg");
127 data->alternate_urls.push_back( 128 data->alternate_urls.push_back(
128 std::string("http://").append(type).append("foo/alt")); 129 std::string("http://").append(type).append("foo/alt"));
129 data->favicon_url = GURL("http://icon1"); 130 data->favicon_url = GURL("http://icon1");
130 data->safe_for_autoreplace = true; 131 data->safe_for_autoreplace = true;
131 data->show_in_default_list = true; 132 data->show_in_default_list = true;
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 318
318 ExpectSimilar(extension_data_3.get(), 319 ExpectSimilar(extension_data_3.get(),
319 manager.GetDefaultSearchEngine(&source)); 320 manager.GetDefaultSearchEngine(&source));
320 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); 321 EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
321 322
322 manager.ClearExtensionControlledDefaultSearchEngine(); 323 manager.ClearExtensionControlledDefaultSearchEngine();
323 324
324 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source)); 325 ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
325 EXPECT_EQ(DefaultSearchManager::FROM_USER, source); 326 EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
326 } 327 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698