summaryrefslogtreecommitdiffstats
path: root/chrome/browser/search
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/search')
-rw-r--r--chrome/browser/search/local_ntp_source.cc2
-rw-r--r--chrome/browser/search/local_omnibox_popup_source.cc2
-rw-r--r--chrome/browser/search/search.cc3
-rw-r--r--chrome/browser/search/search_unittest.cc9
4 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc
index 38cbd7a..d1fde35 100644
--- a/chrome/browser/search/local_ntp_source.cc
+++ b/chrome/browser/search/local_ntp_source.cc
@@ -74,7 +74,7 @@ std::string LocalNtpSource::GetMimeType(
path == kCloseBarActiveFilename) {
return "image/png";
}
- return std::string();
+ return "";
}
bool LocalNtpSource::ShouldServiceRequest(
diff --git a/chrome/browser/search/local_omnibox_popup_source.cc b/chrome/browser/search/local_omnibox_popup_source.cc
index fa2d940..1ae3c8a 100644
--- a/chrome/browser/search/local_omnibox_popup_source.cc
+++ b/chrome/browser/search/local_omnibox_popup_source.cc
@@ -76,7 +76,7 @@ std::string LocalOmniboxPopupSource::GetMimeType(
if (path == kPageIconFilename || path == kPageIcon2xFilename ||
path == kSearchIconFilename || path == kSearchIcon2xFilename)
return "image/png";
- return std::string();
+ return "";
}
bool LocalOmniboxPopupSource::ShouldServiceRequest(
diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
index 726bc89..83186b4 100644
--- a/chrome/browser/search/search.cc
+++ b/chrome/browser/search/search.cc
@@ -527,8 +527,7 @@ uint64 GetUInt64ValueForFlagWithDefault(const std::string& flag,
uint64 default_value,
const FieldTrialFlags& flags) {
uint64 value;
- std::string str_value =
- GetStringValueForFlagWithDefault(flag, std::string(), flags);
+ std::string str_value = GetStringValueForFlagWithDefault(flag, "", flags);
if (base::StringToUint64(str_value, &value))
return value;
return default_value;
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 7c4bf4c..90ff642b 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -22,7 +22,7 @@ TEST(EmbeddedSearchFieldTrialTest, GetFieldTrialInfo) {
uint64 group_number = 0;
const uint64 ZERO = 0;
- EXPECT_FALSE(GetFieldTrialInfo(std::string(), &flags, &group_number));
+ EXPECT_FALSE(GetFieldTrialInfo("", &flags, &group_number));
EXPECT_EQ(ZERO, group_number);
EXPECT_EQ(ZERO, flags.size());
@@ -62,10 +62,9 @@ TEST(EmbeddedSearchFieldTrialTest, GetFieldTrialInfo) {
EXPECT_EQ(uint64(3), flags.size());
EXPECT_EQ(true, GetBoolValueForFlagWithDefault("bar", false, flags));
EXPECT_EQ(uint64(7), GetUInt64ValueForFlagWithDefault("baz", 0, flags));
- EXPECT_EQ("dogs",
- GetStringValueForFlagWithDefault("cat", std::string(), flags));
- EXPECT_EQ("default",
- GetStringValueForFlagWithDefault("moose", "default", flags));
+ EXPECT_EQ("dogs", GetStringValueForFlagWithDefault("cat", "", flags));
+ EXPECT_EQ("default", GetStringValueForFlagWithDefault(
+ "moose", "default", flags));
group_number = 0;
flags.clear();