Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5089)

Unified Diff: chrome/common/metrics/variations/experiment_labels_unittest.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/metrics/variations/experiment_labels.cc ('k') | chrome/common/multi_process_lock_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/metrics/variations/experiment_labels_unittest.cc
diff --git a/chrome/common/metrics/variations/experiment_labels_unittest.cc b/chrome/common/metrics/variations/experiment_labels_unittest.cc
index 977d81e1cc724db7857ee2ea870bc7a4c6ec7fdd..942174d848992d08f4382711493bb179f3d1e8cb 100644
--- a/chrome/common/metrics/variations/experiment_labels_unittest.cc
+++ b/chrome/common/metrics/variations/experiment_labels_unittest.cc
@@ -71,7 +71,7 @@ TEST(ExperimentLabelsTest, BuildGoogleUpdateExperimentLabel) {
std::vector<std::string> expected_ids_list;
base::SplitString(test_cases[i].expected_ids, '#', &expected_ids_list);
- std::string experiment_labels_string = UTF16ToUTF8(
+ std::string experiment_labels_string = base::UTF16ToUTF8(
BuildGoogleUpdateExperimentLabel(groups));
// Split the VariationIDs from the labels for verification below.
@@ -127,9 +127,9 @@ TEST(ExperimentLabelsTest, CombineExperimentLabels) {
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
- std::string result = UTF16ToUTF8(CombineExperimentLabels(
- ASCIIToUTF16(test_cases[i].variations_labels),
- ASCIIToUTF16(test_cases[i].other_labels)));
+ std::string result = base::UTF16ToUTF8(CombineExperimentLabels(
+ base::ASCIIToUTF16(test_cases[i].variations_labels),
+ base::ASCIIToUTF16(test_cases[i].other_labels)));
EXPECT_EQ(test_cases[i].expected_label, result);
}
}
@@ -183,8 +183,9 @@ TEST(ExperimentLabelsTest, ExtractNonVariationLabels) {
};
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
- std::string non_variation_labels = UTF16ToUTF8(
- ExtractNonVariationLabels(ASCIIToUTF16(test_cases[i].input_label)));
+ std::string non_variation_labels = base::UTF16ToUTF8(
+ ExtractNonVariationLabels(
+ base::ASCIIToUTF16(test_cases[i].input_label)));
EXPECT_EQ(test_cases[i].expected_output, non_variation_labels);
}
}
« no previous file with comments | « chrome/common/metrics/variations/experiment_labels.cc ('k') | chrome/common/multi_process_lock_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698