diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
| commit | 47e870bf26f0c01dafe611ec03c0139c735063df (patch) | |
| tree | 43b29b36654d896cf3fd1bd3cc27b830c63522b0 /chrome/installer/gcapi | |
| parent | 883844f40f19b80880e0730a8e2836e6383d1400 (diff) | |
| download | chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.zip chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.gz chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.bz2 | |
Revert 184352
> Add utf_string_conversions to base namespace.
>
> This adds "using"s for all functions so those can be fixed in a separate pass.
>
> This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/12314090
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12315071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 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_reactivation_test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/gcapi/gcapi_last_run_test.cc b/chrome/installer/gcapi/gcapi_last_run_test.cc index 1897cf4..79fd835 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", base::ASCIIToWide(base::GenerateGUID())); + L"hkcu_override\\%ls", 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_reactivation_test.cc b/chrome/installer/gcapi/gcapi_reactivation_test.cc index 07b788f..e8cc34d 100644 --- a/chrome/installer/gcapi/gcapi_reactivation_test.cc +++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc @@ -38,10 +38,10 @@ class GCAPIReactivationTest : public ::testing::Test { void SetUp() { // Override keys - this is undone during destruction. std::wstring hkcu_override = base::StringPrintf( - L"hkcu_override\\%ls", base::ASCIIToWide(base::GenerateGUID())); + L"hkcu_override\\%ls", ASCIIToWide(base::GenerateGUID())); override_manager_.OverrideRegistry(HKEY_CURRENT_USER, hkcu_override); std::wstring hklm_override = base::StringPrintf( - L"hklm_override\\%ls", base::ASCIIToWide(base::GenerateGUID())); + L"hklm_override\\%ls", ASCIIToWide(base::GenerateGUID())); override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, hklm_override); } |