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

chrome/installer/gcapi/gcapi_omaha_experiment.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 25 matching lines @@
   const bool system_level = shell_mode == GCAPI_INVOKED_UAC_ELEVATION;
 
   base::string16 original_labels;
   if (!GoogleUpdateSettings::ReadExperimentLabels(system_level,
                                                   &original_labels)) {
     return false;
   }
 
   // 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;
   for (std::vector<base::string16>::const_iterator it = entries.begin();
        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;
     }
   }
 
   new_labels.append(
       gcapi_internals::GetGCAPIExperimentLabel(brand_code, label));
 
   return GoogleUpdateSettings::SetExperimentLabels(system_level,
                                                    new_labels);
 }
 
@@ skipping 31 matching lines @@
 bool SetReactivationExperimentLabels(const wchar_t* brand_code,
                                      int shell_mode) {
   return SetExperimentLabel(brand_code, gcapi_internals::kReactivationLabel,
                             shell_mode);
 }
 
 bool SetRelaunchExperimentLabels(const wchar_t* brand_code, int shell_mode) {
   return SetExperimentLabel(brand_code, gcapi_internals::kRelaunchLabel,
                             shell_mode);
 }