| Index: chrome/common/variations/experiment_labels.cc
|
| diff --git a/chrome/common/variations/experiment_labels.cc b/chrome/common/variations/experiment_labels.cc
|
| index 7ec0ea26121ad7d0bb5dd91c1910ad9c6fb0fe53..6c952440cb477ef10738015c244ac1f1e2363f56 100644
|
| --- a/chrome/common/variations/experiment_labels.cc
|
| +++ b/chrome/common/variations/experiment_labels.cc
|
| @@ -79,7 +79,7 @@ base::string16 ExtractNonVariationLabels(const base::string16& labels) {
|
| for (std::vector<base::string16>::const_iterator it = entries.begin();
|
| it != entries.end(); ++it) {
|
| if (it->empty() ||
|
| - StartsWith(*it, base::ASCIIToUTF16(kVariationPrefix), false)) {
|
| + base::StartsWith(*it, base::ASCIIToUTF16(kVariationPrefix), false)) {
|
| continue;
|
| }
|
|
|
| @@ -95,9 +95,9 @@ base::string16 ExtractNonVariationLabels(const base::string16& labels) {
|
| base::string16 CombineExperimentLabels(const base::string16& variation_labels,
|
| const base::string16& other_labels) {
|
| const base::string16 separator(1, google_update::kExperimentLabelSeparator);
|
| - DCHECK(!StartsWith(variation_labels, separator, false));
|
| + DCHECK(!base::StartsWith(variation_labels, separator, false));
|
| DCHECK(!EndsWith(variation_labels, separator, false));
|
| - DCHECK(!StartsWith(other_labels, separator, false));
|
| + DCHECK(!base::StartsWith(other_labels, separator, false));
|
| DCHECK(!EndsWith(other_labels, separator, false));
|
| // Note that if either label is empty, a separator is not necessary.
|
| base::string16 combined_labels = other_labels;
|
|
|