diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 19:37:03 +0000 |
commit | 6c3bf032651d5f912775e0c8cd7e962454145ced (patch) | |
tree | 88cf8b652147b9acf47aa81999f8652609890dde /remoting/base | |
parent | ce51317df2e23a717f95e56e1a9db1a7fb330a16 (diff) | |
download | chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.zip chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.gz chromium_src-6c3bf032651d5f912775e0c8cd7e962454145ced.tar.bz2 |
Update uses of UTF conversions in ppapi/, printing/, remoting/, rlz/, sandbox/, skia/, sql/, sync/, tools/, webkit/, win8/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/121123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r-- | remoting/base/breakpad_win.cc | 3 | ||||
-rw-r--r-- | remoting/base/breakpad_win_unittest.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc index 6dce6db2..0c1f5bd 100644 --- a/remoting/base/breakpad_win.cc +++ b/remoting/base/breakpad_win.cc @@ -153,7 +153,8 @@ google_breakpad::CustomClientInfo* BreakpadWin::GetCustomInfo() { static wchar_t version[64]; if (version_info.get()) { - wcscpy_s(version, UTF16ToWide(version_info->product_version()).c_str()); + wcscpy_s(version, + base::UTF16ToWide(version_info->product_version()).c_str()); } else { wcscpy_s(version, kBreakpadVersionDefault); } diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc index 53f5a8d..9f93f78 100644 --- a/remoting/base/breakpad_win_unittest.cc +++ b/remoting/base/breakpad_win_unittest.cc @@ -91,7 +91,7 @@ void BreakpadWinDeathTest::SetUp() { if (environment->GetVar(kPipeVariableName, &pipe_name)) { // This is a child process. Initialize crash dump reporting to the crash // dump server. - pipe_name_ = UTF8ToWide(pipe_name); + pipe_name_ = base::UTF8ToWide(pipe_name); InitializeCrashReportingForTest(pipe_name_.c_str()); } else { // This is the parent process. Generate a unique pipe name and setup @@ -116,7 +116,7 @@ void BreakpadWinDeathTest::SetUp() { guid.Data4[6], guid.Data4[7]); EXPECT_TRUE(environment->SetVar(kPipeVariableName, - WideToUTF8(pipe_name_))); + base::WideToUTF8(pipe_name_))); // Setup a dummy crash dump server. callbacks_.reset(new MockCrashServerCallbacks()); |