diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 00:53:42 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 00:53:42 +0000 |
commit | c91b9d414c56955f3ca405fd66c6f567fc16d9fc (patch) | |
tree | 293205b4a78c5ce8571edcb4ae26e1b9880d8e51 /chrome/installer/gcapi | |
parent | 036a5f386e1204a861f3b24201bd0f89d359f29c (diff) | |
download | chromium_src-c91b9d414c56955f3ca405fd66c6f567fc16d9fc.zip chromium_src-c91b9d414c56955f3ca405fd66c6f567fc16d9fc.tar.gz chromium_src-c91b9d414c56955f3ca405fd66c6f567fc16d9fc.tar.bz2 |
Update uses of UTF conversions in chrome/installer, chrome/renderer, chrome/service, chrome/test, chrome/third_party, chrome/tools, chrome/utility to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/119103004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi')
-rw-r--r-- | chrome/installer/gcapi/gcapi_last_run_test.cc | 2 | ||||
-rw-r--r-- | chrome/installer/gcapi/gcapi_omaha_experiment.cc | 4 | ||||
-rw-r--r-- | chrome/installer/gcapi/gcapi_omaha_experiment_test.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/installer/gcapi/gcapi_last_run_test.cc b/chrome/installer/gcapi/gcapi_last_run_test.cc index 02a1974..503bb5f 100644 --- a/chrome/installer/gcapi/gcapi_last_run_test.cc +++ b/chrome/installer/gcapi/gcapi_last_run_test.cc @@ -27,7 +27,7 @@ class GCAPILastRunTest : public ::testing::Test { void SetUp() { // Override keys - this is undone during destruction. std::wstring hkcu_override = base::StringPrintf( - L"hkcu_override\\%ls", ASCIIToWide(base::GenerateGUID())); + L"hkcu_override\\%ls", base::ASCIIToWide(base::GenerateGUID())); override_manager_.OverrideRegistry(HKEY_CURRENT_USER, hkcu_override); // Create the client state key in the right places. diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment.cc b/chrome/installer/gcapi/gcapi_omaha_experiment.cc index 4b64a77..d8c3087 100644 --- a/chrome/installer/gcapi/gcapi_omaha_experiment.cc +++ b/chrome/installer/gcapi/gcapi_omaha_experiment.cc @@ -45,7 +45,7 @@ bool SetExperimentLabel(const wchar_t* brand_code, std::vector<base::string16> entries; base::SplitStringUsingSubstr( original_labels, - ASCIIToUTF16(google_update::kExperimentLabelSep), + base::ASCIIToUTF16(google_update::kExperimentLabelSep), &entries); // Keep all labels, but the one we want to add/replace. @@ -54,7 +54,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 += ASCIIToUTF16(google_update::kExperimentLabelSep); + new_labels += base::ASCIIToUTF16(google_update::kExperimentLabelSep); } } diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc index a464141..98fcf66 100644 --- a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc +++ b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc @@ -12,6 +12,8 @@ #include "chrome/installer/util/google_update_settings.h" #include "testing/gtest/include/gtest/gtest.h" +using base::ASCIIToUTF16; + namespace { const wchar_t kBrand[] = L"ABCD"; |