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

chrome/installer/gcapi/gcapi_omaha_experiment.cc

Index: chrome/installer/gcapi/gcapi_omaha_experiment.cc
diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment.cc b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
index d8c30877f37fb3120ed3e78dd08644340f3fc5db..c49de3d34353007b108cfb065f1f44abb33ff0ad 100644
--- a/chrome/installer/gcapi/gcapi_omaha_experiment.cc
+++ b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
@@ -43,10 +43,8 @@ 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),
-      &entries);
+  base::SplitString(original_labels, google_update::kExperimentLabelSeparator,
+                    &entries);
 
   // Keep all labels, but the one we want to add/replace.
   base::string16 new_labels;
@@ -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;
     }
   }