Cleanup, mostly replacing uses of SplitStringUsingSubstr() with SplitString(),

also some other misc. changes to shorten code, remove a using directive, etc.

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/291653007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272624 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prerender/prerender_field_trial.cc

@@ -23,7 +23,6 @@
 
 using base::FieldTrial;
 using base::FieldTrialList;
-using base::SplitStringUsingSubstr;
 using base::StringToInt;
 using std::string;
 using std::vector;
@@ -258,7 +257,7 @@ bool IsOmniboxEnabled(Profile* profile) {
     if (switch_value == switches::kPrerenderFromOmniboxSwitchValueDisabled)
       return false;
 
-    DCHECK(switch_value == switches::kPrerenderFromOmniboxSwitchValueAuto);
+    DCHECK_EQ(switches::kPrerenderFromOmniboxSwitchValueAuto, switch_value);
   }
 
   const int group = FieldTrialList::FindValue(kOmniboxTrialName);
@@ -276,13 +275,11 @@ LocalPredictorSpec.
 */
 string GetLocalPredictorSpecValue(string spec_key) {
   vector<string> elements;
-  SplitStringUsingSubstr(
-      FieldTrialList::FindFullName(kLocalPredictorSpecTrialName),
-      ":",
-      &elements);
+  base::SplitString(FieldTrialList::FindFullName(kLocalPredictorSpecTrialName),
+                    ':', &elements);
   for (int i = 0; i < static_cast<int>(elements.size()); i++) {
     vector<string> key_value;
-    SplitStringUsingSubstr(elements[i], "=", &key_value);
+    base::SplitString(elements[i], '=', &key_value);
     if (key_value.size() == 2 && key_value[0] == spec_key)
       return key_value[1];
   }
@@ -302,11 +299,10 @@ bool IsLocalPredictorEnabled() {
 #if defined(OS_ANDROID) || defined(OS_IOS)
   return false;
 #endif
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisablePrerenderLocalPredictor)) {
-    return false;
-  }
-  return GetLocalPredictorSpecValue(kLocalPredictorKeyName) == kEnabledGroup;
+  return
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisablePrerenderLocalPredictor) &&
+      GetLocalPredictorSpecValue(kLocalPredictorKeyName) == kEnabledGroup;
 }
 
 bool DisableLocalPredictorBasedOnSyncAndConfiguration(Profile* profile) {
@@ -355,9 +351,7 @@ string GetPrerenderServiceURLPrefix() {
   string prefix = chrome_variations::GetVariationParamValue(
       kLocalPredictorSpecTrialName,
       kPrerenderServiceURLPrefixParameterName);
-  if (prefix.empty())
-    prefix = kDefaultPrerenderServiceURLPrefix;
-  return prefix;
+  return prefix.empty() ? kDefaultPrerenderServiceURLPrefix : prefix;
 }
 
 int GetPrerenderServiceBehaviorID() {
@@ -365,30 +359,24 @@ int GetPrerenderServiceBehaviorID() {
   StringToInt(GetLocalPredictorSpecValue(kPrerenderServiceBehaviorIDKeyName),
               &id);
   // The behavior ID must be non-negative.
-  if (id < 0)
-    id = 0;
-  return id;
+  return std::max(id, 0);
 }
 
 int GetPrerenderServiceFetchTimeoutMs() {
   int result;
   StringToInt(GetLocalPredictorSpecValue(kPrerenderServiceFetchTimeoutKeyName),
               &result);
-  // The behavior ID must be non-negative.
-  if (result < kMinPrerenderServiceTimeoutMs ||
-      result > kMaxPrerenderServiceTimeoutMs) {
-    result = kDefaultPrerenderServiceTimeoutMs;
-  }
-  return result;
+  // If the value is outside the valid range, use the default value.
+  return (result < kMinPrerenderServiceTimeoutMs ||
+          result > kMaxPrerenderServiceTimeoutMs) ?
+      kDefaultPrerenderServiceTimeoutMs : result;
 }
 
 int GetLocalPredictorTTLSeconds() {
   int ttl;
   StringToInt(GetLocalPredictorSpecValue(kPrerenderTTLKeyName), &ttl);
   // If the value is outside of 10s or 600s, use a default value of 180s.
-  if (ttl < 10 || ttl > 600)
-    ttl = 180;
-  return ttl;
+  return (ttl < 10 || ttl > 600) ? 180 : ttl;
 }
 
 int GetLocalPredictorPrerenderPriorityHalfLifeTimeSeconds() {
@@ -396,23 +384,16 @@ int GetLocalPredictorPrerenderPriorityHalfLifeTimeSeconds() {
   StringToInt(GetLocalPredictorSpecValue(kPrerenderPriorityHalfLifeTimeKeyName),
               &half_life_time);
   // Sanity check: Ensure the half life time is non-negative.
-  if (half_life_time < 0)
-    half_life_time = 0;
-  return half_life_time;
+  return std::max(half_life_time, 0);
 }
 
 int GetLocalPredictorMaxConcurrentPrerenders() {
   int num_prerenders;
   StringToInt(GetLocalPredictorSpecValue(kMaxConcurrentPrerenderKeyName),
               &num_prerenders);
-  // Sanity check: Ensure the number of prerenders is at least 1.
-  if (num_prerenders < 1)
-    num_prerenders = 1;
-  // Sanity check: Ensure the number of prerenders is at most 10.
-  if (num_prerenders > 10)
-    num_prerenders = 10;
-  return num_prerenders;
-};
+  // Sanity check: Ensure the number of prerenders is between 1 and 10.
+  return std::min(std::max(num_prerenders, 1), 10);
+}
 
 bool SkipLocalPredictorFragment() {
   return GetLocalPredictorSpecValue(kSkipFragment) == kEnabledGroup;

chrome/common/variations/experiment_labels.cc

@@ -58,10 +58,8 @@ base::string16 BuildGoogleUpdateExperimentLabel(
     if (id == EMPTY_ID)
       continue;
 
-    if (!experiment_labels.empty()) {
-      experiment_labels +=
-          base::ASCIIToUTF16(google_update::kExperimentLabelSep);
-    }
+    if (!experiment_labels.empty())
+      experiment_labels += google_update::kExperimentLabelSeparator;
     experiment_labels += CreateSingleExperimentLabel(++counter, id,
                                                      current_time);
   }
@@ -70,15 +68,12 @@ base::string16 BuildGoogleUpdateExperimentLabel(
 }
 
 base::string16 ExtractNonVariationLabels(const base::string16& labels) {
-  const base::string16 separator =
-      base::ASCIIToUTF16(google_update::kExperimentLabelSep);
-  base::string16 non_variation_labels;
-
   // First, split everything by the label separator.
   std::vector<base::string16> entries;
-  base::SplitStringUsingSubstr(labels, separator, &entries);
+  base::SplitString(labels, google_update::kExperimentLabelSeparator, &entries);
 
   // For each label, keep the ones that do not look like a Variations label.
+  base::string16 non_variation_labels;
   for (std::vector<base::string16>::const_iterator it = entries.begin();
        it != entries.end(); ++it) {
     if (it->empty() ||
@@ -88,7 +83,7 @@ base::string16 ExtractNonVariationLabels(const base::string16& labels) {
 
     // Dump the whole thing, including the timestamp.
     if (!non_variation_labels.empty())
-      non_variation_labels += separator;
+      non_variation_labels += google_update::kExperimentLabelSeparator;
     non_variation_labels += *it;
   }
 
@@ -97,8 +92,7 @@ base::string16 ExtractNonVariationLabels(const base::string16& labels) {
 
 base::string16 CombineExperimentLabels(const base::string16& variation_labels,
                                        const base::string16& other_labels) {
-  const base::string16 separator =
-      base::ASCIIToUTF16(google_update::kExperimentLabelSep);
+  const base::string16 separator(1, google_update::kExperimentLabelSeparator);
   DCHECK(!StartsWith(variation_labels, separator, false));
   DCHECK(!EndsWith(variation_labels, separator, false));
   DCHECK(!StartsWith(other_labels, separator, false));
@@ -106,7 +100,7 @@ base::string16 CombineExperimentLabels(const base::string16& variation_labels,
   // Note that if either label is empty, a separator is not necessary.
   base::string16 combined_labels = other_labels;
   if (!other_labels.empty() && !variation_labels.empty())
-    combined_labels += separator;
+    combined_labels += google_update::kExperimentLabelSeparator;
   combined_labels += variation_labels;
   return combined_labels;
 }

chrome/installer/gcapi/gcapi_omaha_experiment.cc

@@ -43,9 +43,7 @@ bool SetExperimentLabel(const wchar_t* brand_code,
 
   // Split the original labels by the label separator.
   std::vector<base::string16> entries;
-  base::SplitStringUsingSubstr(
-      original_labels,
-      base::ASCIIToUTF16(google_update::kExperimentLabelSep),
+  base::SplitString(original_labels, google_update::kExperimentLabelSeparator,
                     &entries);
 
   // Keep all labels, but the one we want to add/replace.
@@ -54,7 +52,7 @@ bool SetExperimentLabel(const wchar_t* brand_code,
        it != entries.end(); ++it) {
     if (!it->empty() && !StartsWith(*it, label + L"=", true)) {
       new_labels += *it;
-      new_labels += base::ASCIIToUTF16(google_update::kExperimentLabelSep);
+      new_labels += google_update::kExperimentLabelSeparator;
     }
   }
 

chrome/installer/gcapi/gcapi_omaha_experiment_test.cc

@@ -66,7 +66,7 @@ TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
@@ -74,18 +74,18 @@ TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
 TEST_F(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingIdenticalExperiment) {
   base::string16 previous_labels(kSomeExperiments);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(reactivation_label_);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(kSomeOtherExperiments);
   GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
 
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(kSomeOtherExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
@@ -93,14 +93,14 @@ TEST_F(GCAPIOmahaExperimentTest,
 TEST_F(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingIdenticalAtBeginning) {
   base::string16 previous_labels(reactivation_label_);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(kSomeExperiments);
   GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
 
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
@@ -108,30 +108,30 @@ TEST_F(GCAPIOmahaExperimentTest,
 TEST_F(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithFakeMatchInAnExperiment) {
   base::string16 previous_labels(kSomeExperiments);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(L"blah_");
   // Shouldn't match deletion criteria.
   previous_labels.append(reactivation_label_);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(kSomeOtherExperiments);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   // Should match the deletion criteria.
   previous_labels.append(reactivation_label_);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(kSomeMoreExperiments);
   GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
 
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(L"blah_");
   expected_labels.append(reactivation_label_);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(kSomeOtherExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(kSomeMoreExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
@@ -139,23 +139,23 @@ TEST_F(GCAPIOmahaExperimentTest,
 TEST_F(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithFakeMatchInAnExperimentAndNoRealMatch) {
   base::string16 previous_labels(kSomeExperiments);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(L"blah_");
   // Shouldn't match deletion criteria.
   previous_labels.append(reactivation_label_);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   previous_labels.append(kSomeOtherExperiments);
   GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
 
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(L"blah_");
   expected_labels.append(reactivation_label_);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(kSomeOtherExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }
@@ -163,7 +163,7 @@ TEST_F(GCAPIOmahaExperimentTest,
 TEST_F(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingEntryWithLabelAsPrefix) {
   base::string16 previous_labels(kSomeExperiments);
-  previous_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  previous_labels += google_update::kExperimentLabelSeparator;
   // Append prefix matching the label, but not followed by '='.
   previous_labels.append(gcapi_internals::kReactivationLabel);
   // Shouldn't match deletion criteria.
@@ -173,10 +173,10 @@ TEST_F(GCAPIOmahaExperimentTest,
   ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
 
   base::string16 expected_labels(kSomeExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(gcapi_internals::kReactivationLabel);
   expected_labels.append(kSomeOtherExperiments);
-  expected_labels.append(ASCIIToUTF16(google_update::kExperimentLabelSep));
+  expected_labels += google_update::kExperimentLabelSeparator;
   expected_labels.append(reactivation_label_);
   VerifyExperimentLabels(expected_labels);
 }

chrome/installer/util/google_update_experiment_util.cc

@@ -17,7 +17,7 @@ namespace google_update {
 const wchar_t kExperimentLabels[] = L"experiment_labels";
 #endif
 
-const char kExperimentLabelSep[] = ";";
+const base::char16 kExperimentLabelSeparator = ';';
 
 }  // namespace google_update
 

chrome/installer/util/google_update_experiment_util.h

@@ -19,9 +19,8 @@ namespace google_update {
 extern const wchar_t kExperimentLabels[];
 #endif
 
-// The separator used to separate items in kExperimentLabels.  This is a UTF-8
-// string because it is used on platforms other than Windows.
-extern const char kExperimentLabelSep[];
+// The separator used to separate items in kExperimentLabels.
+extern const base::char16 kExperimentLabelSeparator;
 
 }  // namespace google_update
 

net/base/mime_util.cc

@@ -924,8 +924,7 @@ void GetExtensionsFromHardCodedMappings(
   for (size_t i = 0; i < mappings_len; ++i) {
     if (StartsWithASCII(mappings[i].mime_type, leading_mime_type, false)) {
       std::vector<string> this_extensions;
-      base::SplitStringUsingSubstr(mappings[i].extensions, ",",
-                                   &this_extensions);
+      base::SplitString(mappings[i].extensions, ',', &this_extensions);
       for (size_t j = 0; j < this_extensions.size(); ++j) {
 #if defined(OS_WIN)
         base::FilePath::StringType extension(