summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:47:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-12 23:47:45 +0000
commit2c4fcc993ec368bdfee6e30b25c7fff84ecc9202 (patch)
tree2f4743f5e9bd3f94ee53735aaafe25c168d2e42d
parent8bdded0fb5bdde0eec9b235b9876760f166e45b1 (diff)
downloadchromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.zip
chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.gz
chromium_src-2c4fcc993ec368bdfee6e30b25c7fff84ecc9202.tar.bz2
Replace string16 with base::string16 in gpu, media, and remoting.
R=piman@chromium.org, scherkus@chromium.org, sergeyu@chromium.org TBR=piman, scherkus, wez Review URL: https://codereview.chromium.org/114613002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240484 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/config/gpu_info_collector_win.cc6
-rw-r--r--media/audio/audio_manager.h2
-rw-r--r--media/audio/audio_manager_base.cc4
-rw-r--r--media/audio/audio_manager_base.h2
-rw-r--r--media/audio/audio_output_proxy_unittest.cc2
-rw-r--r--media/audio/mock_audio_manager.cc4
-rw-r--r--media/audio/mock_audio_manager.h2
-rw-r--r--media/audio/win/audio_manager_win.cc24
-rw-r--r--media/audio/win/audio_manager_win.h2
-rw-r--r--remoting/host/clipboard_win.cc4
-rw-r--r--remoting/host/disconnect_window_gtk.cc3
-rw-r--r--remoting/host/disconnect_window_mac.h2
-rw-r--r--remoting/host/disconnect_window_win.cc10
-rw-r--r--remoting/host/host_event_logger_win.cc2
-rw-r--r--remoting/host/plugin/host_script_object.cc7
-rw-r--r--remoting/host/plugin/host_script_object.h4
-rw-r--r--remoting/host/setup/daemon_controller_delegate_win.cc6
-rw-r--r--remoting/host/setup/daemon_installer_win.cc2
-rw-r--r--remoting/host/win/elevated_controller.cc8
-rw-r--r--remoting/host/win/launch_process_with_token.cc4
-rw-r--r--remoting/host/win/rdp_client_window.cc4
-rw-r--r--remoting/host/win/security_descriptor.cc2
22 files changed, 56 insertions, 50 deletions
diff --git a/gpu/config/gpu_info_collector_win.cc b/gpu/config/gpu_info_collector_win.cc
index 898863d1..6467262 100644
--- a/gpu/config/gpu_info_collector_win.cc
+++ b/gpu/config/gpu_info_collector_win.cc
@@ -182,7 +182,7 @@ Version DisplayLinkVersion() {
if (key.OpenKey(L"Core", KEY_READ | KEY_WOW64_64KEY))
return Version();
- string16 version;
+ base::string16 version;
if (key.ReadValue(L"Version", &version))
return Version();
@@ -590,8 +590,8 @@ bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
return false;
int vendor_id = 0, device_id = 0;
- string16 vendor_id_string = id.substr(8, 4);
- string16 device_id_string = id.substr(17, 4);
+ base::string16 vendor_id_string = id.substr(8, 4);
+ base::string16 device_id_string = id.substr(17, 4);
base::HexStringToInt(WideToASCII(vendor_id_string), &vendor_id);
base::HexStringToInt(WideToASCII(device_id_string), &device_id);
gpu_info->gpu.vendor_id = vendor_id;
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index cf88a8f..0ca468e 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -54,7 +54,7 @@ class MEDIA_EXPORT AudioManager {
// Returns a human readable string for the model/make of the active audio
// input device for this computer.
- virtual string16 GetAudioInputDeviceModel() = 0;
+ virtual base::string16 GetAudioInputDeviceModel() = 0;
// Opens the platform default audio input settings UI.
// Note: This could invoke an external application/preferences pane, so
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 34dc2e3d..068a450 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -121,8 +121,8 @@ AudioManagerBase::~AudioManagerBase() {
DCHECK_EQ(0, num_input_streams_);
}
-string16 AudioManagerBase::GetAudioInputDeviceModel() {
- return string16();
+base::string16 AudioManagerBase::GetAudioInputDeviceModel() {
+ return base::string16();
}
scoped_refptr<base::MessageLoopProxy> AudioManagerBase::GetMessageLoop() {
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h
index 45b757f..09b021a 100644
--- a/media/audio/audio_manager_base.h
+++ b/media/audio/audio_manager_base.h
@@ -51,7 +51,7 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager {
virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
virtual scoped_refptr<base::MessageLoopProxy> GetWorkerLoop() OVERRIDE;
- virtual string16 GetAudioInputDeviceModel() OVERRIDE;
+ virtual base::string16 GetAudioInputDeviceModel() OVERRIDE;
virtual void ShowAudioInputSettings() OVERRIDE;
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index af46725..cea0988 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -93,7 +93,7 @@ class MockAudioManager : public AudioManagerBase {
MOCK_METHOD0(HasAudioOutputDevices, bool());
MOCK_METHOD0(HasAudioInputDevices, bool());
- MOCK_METHOD0(GetAudioInputDeviceModel, string16());
+ MOCK_METHOD0(GetAudioInputDeviceModel, base::string16());
MOCK_METHOD3(MakeAudioOutputStream, AudioOutputStream*(
const AudioParameters& params,
const std::string& device_id,
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index de4a5a7..f2074d6 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -25,8 +25,8 @@ bool MockAudioManager::HasAudioInputDevices() {
return true;
}
-string16 MockAudioManager::GetAudioInputDeviceModel() {
- return string16();
+base::string16 MockAudioManager::GetAudioInputDeviceModel() {
+ return base::string16();
}
void MockAudioManager::ShowAudioInputSettings() {
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h
index 6ccb6cc..2d71fe8 100644
--- a/media/audio/mock_audio_manager.h
+++ b/media/audio/mock_audio_manager.h
@@ -27,7 +27,7 @@ class MockAudioManager : public media::AudioManager {
virtual bool HasAudioInputDevices() OVERRIDE;
- virtual string16 GetAudioInputDeviceModel() OVERRIDE;
+ virtual base::string16 GetAudioInputDeviceModel() OVERRIDE;
virtual void ShowAudioInputSettings() OVERRIDE;
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
index 17212d0..083d46d 100644
--- a/media/audio/win/audio_manager_win.cc
+++ b/media/audio/win/audio_manager_win.cc
@@ -73,8 +73,8 @@ static int GetVersionPartAsInt(DWORDLONG num) {
// Returns a string containing the given device's description and installed
// driver version.
-static string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
- SP_DEVINFO_DATA* device_data) {
+static base::string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
+ SP_DEVINFO_DATA* device_data) {
// Save the old install params setting and set a flag for the
// SetupDiBuildDriverInfoList below to return only the installed drivers.
SP_DEVINSTALL_PARAMS old_device_install_params;
@@ -88,13 +88,13 @@ static string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
SP_DRVINFO_DATA driver_data;
driver_data.cbSize = sizeof(driver_data);
- string16 device_and_driver_info;
+ base::string16 device_and_driver_info;
if (SetupDiBuildDriverInfoList(device_info, device_data,
SPDIT_COMPATDRIVER)) {
if (SetupDiEnumDriverInfo(device_info, device_data, SPDIT_COMPATDRIVER, 0,
&driver_data)) {
DWORDLONG version = driver_data.DriverVersion;
- device_and_driver_info = string16(driver_data.Description) + L" v" +
+ device_and_driver_info = base::string16(driver_data.Description) + L" v" +
base::IntToString16(GetVersionPartAsInt((version >> 48))) + L"." +
base::IntToString16(GetVersionPartAsInt((version >> 32))) + L"." +
base::IntToString16(GetVersionPartAsInt((version >> 16))) + L"." +
@@ -176,7 +176,7 @@ void AudioManagerWin::DestroyDeviceListener() {
output_device_listener_.reset();
}
-string16 AudioManagerWin::GetAudioInputDeviceModel() {
+base::string16 AudioManagerWin::GetAudioInputDeviceModel() {
// Get the default audio capture device and its device interface name.
DWORD device_id = 0;
waveInMessage(reinterpret_cast<HWAVEIN>(WAVE_MAPPER),
@@ -186,13 +186,13 @@ string16 AudioManagerWin::GetAudioInputDeviceModel() {
waveInMessage(reinterpret_cast<HWAVEIN>(device_id),
DRV_QUERYDEVICEINTERFACESIZE,
reinterpret_cast<DWORD_PTR>(&device_interface_name_size), 0);
- size_t bytes_in_char16 = sizeof(string16::value_type);
+ size_t bytes_in_char16 = sizeof(base::string16::value_type);
DCHECK_EQ(0u, device_interface_name_size % bytes_in_char16);
if (device_interface_name_size <= bytes_in_char16)
- return string16(); // No audio capture device.
+ return base::string16(); // No audio capture device.
- string16 device_interface_name;
- string16::value_type* name_ptr = WriteInto(&device_interface_name,
+ base::string16 device_interface_name;
+ base::string16::value_type* name_ptr = WriteInto(&device_interface_name,
device_interface_name_size / bytes_in_char16);
waveInMessage(reinterpret_cast<HWAVEIN>(device_id),
DRV_QUERYDEVICEINTERFACE,
@@ -204,7 +204,7 @@ string16 AudioManagerWin::GetAudioInputDeviceModel() {
HDEVINFO device_info = SetupDiGetClassDevs(
&AM_KSCATEGORY_AUDIO, 0, 0, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
if (device_info == INVALID_HANDLE_VALUE)
- return string16();
+ return base::string16();
DWORD interface_index = 0;
SP_DEVICE_INTERFACE_DATA interface_data;
@@ -229,7 +229,7 @@ string16 AudioManagerWin::GetAudioInputDeviceModel() {
interface_detail,
interface_detail_size, NULL,
&device_data))
- return string16();
+ return base::string16();
bool device_found = (device_interface_name == interface_detail->DevicePath);
@@ -237,7 +237,7 @@ string16 AudioManagerWin::GetAudioInputDeviceModel() {
return GetDeviceAndDriverInfo(device_info, &device_data);
}
- return string16();
+ return base::string16();
}
void AudioManagerWin::ShowAudioInputSettings() {
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 6eb7c12..01044da 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -23,7 +23,7 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices() OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
- virtual string16 GetAudioInputDeviceModel() OVERRIDE;
+ virtual base::string16 GetAudioInputDeviceModel() OVERRIDE;
virtual void ShowAudioInputSettings() OVERRIDE;
virtual void GetAudioInputDeviceNames(
AudioDeviceNames* device_names) OVERRIDE;
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc
index 71cff1c..03d6044 100644
--- a/remoting/host/clipboard_win.cc
+++ b/remoting/host/clipboard_win.cc
@@ -195,7 +195,7 @@ void ClipboardWin::InjectClipboardEvent(
return;
}
- string16 text = UTF8ToUTF16(ReplaceLfByCrLf(event.data()));
+ base::string16 text = UTF8ToUTF16(ReplaceLfByCrLf(event.data()));
ScopedClipboard clipboard;
if (!clipboard.Init(window_->hwnd())) {
@@ -225,7 +225,7 @@ void ClipboardWin::OnClipboardUpdate() {
DCHECK(window_);
if (::IsClipboardFormatAvailable(CF_UNICODETEXT)) {
- string16 text;
+ base::string16 text;
// Add a scope, so that we keep the clipboard open for as short a time as
// possible.
{
diff --git a/remoting/host/disconnect_window_gtk.cc b/remoting/host/disconnect_window_gtk.cc
index 06d417a..5b840e0 100644
--- a/remoting/host/disconnect_window_gtk.cc
+++ b/remoting/host/disconnect_window_gtk.cc
@@ -160,7 +160,8 @@ void DisconnectWindowGtk::Start(
// Extract the user name from the JID.
std::string client_jid = client_session_control_->client_jid();
- string16 username = UTF8ToUTF16(client_jid.substr(0, client_jid.find('/')));
+ base::string16 username =
+ UTF8ToUTF16(client_jid.substr(0, client_jid.find('/')));
gtk_label_set_text(
GTK_LABEL(message_),
l10n_util::GetStringFUTF8(IDR_MESSAGE_SHARED, username).c_str());
diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h
index 692a23d..7fd6115 100644
--- a/remoting/host/disconnect_window_mac.h
+++ b/remoting/host/disconnect_window_mac.h
@@ -15,7 +15,7 @@
@interface DisconnectWindowController : NSWindowController {
@private
base::Closure disconnect_callback_;
- string16 username_;
+ base::string16 username_;
IBOutlet NSTextField* connectedToField_;
IBOutlet NSButton* disconnectButton_;
}
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index 2a8174d..59c8c24 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -78,7 +78,7 @@ class DisconnectWindowWin : public HostWindow {
};
// Returns the text for the given dialog control window.
-bool GetControlText(HWND control, string16* text) {
+bool GetControlText(HWND control, base::string16* text) {
// GetWindowText truncates the text if it is longer than can fit into
// the buffer.
WCHAR buffer[256];
@@ -91,7 +91,9 @@ bool GetControlText(HWND control, string16* text) {
}
// Returns width |text| rendered in |control| window.
-bool GetControlTextWidth(HWND control, const string16& text, LONG* width) {
+bool GetControlTextWidth(HWND control,
+ const base::string16& text,
+ LONG* width) {
RECT rect = {0, 0, 0, 0};
base::win::ScopedGetDC dc(control);
base::win::ScopedSelectObject font(
@@ -306,8 +308,8 @@ bool DisconnectWindowWin::SetStrings() {
if (!hwnd_button || !hwnd_message)
return false;
- string16 button_text;
- string16 message_text;
+ base::string16 button_text;
+ base::string16 message_text;
if (!GetControlText(hwnd_button, &button_text) ||
!GetControlText(hwnd_message, &message_text)) {
return false;
diff --git a/remoting/host/host_event_logger_win.cc b/remoting/host/host_event_logger_win.cc
index 7b634ec..6fd5b6b 100644
--- a/remoting/host/host_event_logger_win.cc
+++ b/remoting/host/host_event_logger_win.cc
@@ -120,7 +120,7 @@ void HostEventLoggerWin::Log(WORD type,
// ReportEventW() takes an array of raw string pointers. They should stay
// valid for the duration of the call.
std::vector<const WCHAR*> raw_strings(strings.size());
- std::vector<string16> utf16_strings(strings.size());
+ std::vector<base::string16> utf16_strings(strings.size());
for (size_t i = 0; i < strings.size(); ++i) {
utf16_strings[i] = UTF8ToUTF16(strings[i]);
raw_strings[i] = utf16_strings[i].c_str();
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc
index 0d4bb3b..288b240 100644
--- a/remoting/host/plugin/host_script_object.cc
+++ b/remoting/host/plugin/host_script_object.cc
@@ -937,14 +937,15 @@ void HostNPScriptObject::LocalizeStrings(NPObject* localize_func) {
// Reload resources for the current locale. The default UI locale is used on
// Windows.
#if !defined(OS_WIN)
- string16 ui_locale;
+ base::string16 ui_locale;
LocalizeString(localize_func, "@@ui_locale", &ui_locale);
remoting::LoadResources(UTF16ToUTF8(ui_locale));
#endif // !defined(OS_WIN)
}
bool HostNPScriptObject::LocalizeString(NPObject* localize_func,
- const char* tag, string16* result) {
+ const char* tag,
+ base::string16* result) {
return LocalizeStringWithSubstitution(localize_func, tag, NULL, result);
}
@@ -952,7 +953,7 @@ bool HostNPScriptObject::LocalizeStringWithSubstitution(
NPObject* localize_func,
const char* tag,
const char* substitution,
- string16* result) {
+ base::string16* result) {
int argc = substitution ? 2 : 1;
scoped_ptr<NPVariant[]> args(new NPVariant[argc]);
STRINGZ_TO_NPVARIANT(tag, args[0]);
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
index ee0ac4a..66fd102 100644
--- a/remoting/host/plugin/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -182,7 +182,7 @@ class HostNPScriptObject : public It2MeHost::Observer {
// |result| and returns true on success, or leaves it unchanged and returns
// false on failure.
bool LocalizeString(NPObject* localize_func, const char* tag,
- string16* result);
+ base::string16* result);
// Helper function for executing InvokeDefault on an NPObject that performs
// a string->string mapping with one substitution. Stores the translation in
@@ -191,7 +191,7 @@ class HostNPScriptObject : public It2MeHost::Observer {
bool LocalizeStringWithSubstitution(NPObject* localize_func,
const char* tag,
const char* substitution,
- string16* result);
+ base::string16* result);
//////////////////////////////////////////////////////////
// Helper methods for Me2Me host.
diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc
index 8a974b6..74f5846 100644
--- a/remoting/host/setup/daemon_controller_delegate_win.cc
+++ b/remoting/host/setup/daemon_controller_delegate_win.cc
@@ -180,7 +180,8 @@ scoped_ptr<base::DictionaryValue> DaemonControllerDelegateWin::GetConfig() {
return scoped_ptr<base::DictionaryValue>();
// Parse the string into a dictionary.
- string16 file_content(static_cast<BSTR>(host_config), host_config.Length());
+ base::string16 file_content(
+ static_cast<BSTR>(host_config), host_config.Length());
scoped_ptr<base::Value> config(
base::JSONReader::Read(UTF16ToUTF8(file_content),
base::JSON_ALLOW_TRAILING_COMMAS));
@@ -277,7 +278,8 @@ std::string DaemonControllerDelegateWin::GetVersion() {
if (FAILED(hr))
return std::string();
- return UTF16ToUTF8(string16(static_cast<BSTR>(version), version.Length()));
+ return UTF16ToUTF8(
+ base::string16(static_cast<BSTR>(version), version.Length()));
}
DaemonController::UsageStatsConsent
diff --git a/remoting/host/setup/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc
index 176efa1..f7b7d35 100644
--- a/remoting/host/setup/daemon_installer_win.cc
+++ b/remoting/host/setup/daemon_installer_win.cc
@@ -293,7 +293,7 @@ void DaemonCommandLineInstallerWin::Install() {
}
// Launch the updater process and wait for its termination.
- string16 command_line = WideToUTF16(
+ base::string16 command_line = WideToUTF16(
base::StringPrintf(kGoogleUpdateCommandLineFormat,
google_update.c_str(),
kHostOmahaAppid,
diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc
index 0bb6d2a..d2eea5e 100644
--- a/remoting/host/win/elevated_controller.cc
+++ b/remoting/host/win/elevated_controller.cc
@@ -250,7 +250,7 @@ HRESULT WriteConfig(const char* content, size_t length, HWND owner_window) {
base::DictionaryValue unprivileged_config_dict;
for (int i = 0; i < arraysize(kUnprivilegedConfigKeys); ++i) {
const char* key = kUnprivilegedConfigKeys[i];
- string16 value;
+ base::string16 value;
if (config_dict->GetString(key, &value)) {
unprivileged_config_dict.SetString(key, value);
}
@@ -338,7 +338,7 @@ STDMETHODIMP ElevatedController::GetVersion(BSTR* version_out) {
scoped_ptr<FileVersionInfo> version_info(
FileVersionInfo::CreateFileVersionInfoForModule(binary));
- string16 version;
+ base::string16 version;
if (version_info.get()) {
version = version_info->product_version();
}
@@ -359,7 +359,7 @@ STDMETHODIMP ElevatedController::SetConfig(BSTR config) {
}
std::string file_content = UTF16ToUTF8(
- string16(static_cast<char16*>(config), ::SysStringLen(config)));
+ base::string16(static_cast<base::char16*>(config), ::SysStringLen(config)));
return WriteConfig(file_content.c_str(), file_content.size(), owner_window_);
}
@@ -452,7 +452,7 @@ STDMETHODIMP ElevatedController::StopDaemon() {
STDMETHODIMP ElevatedController::UpdateConfig(BSTR config) {
// Parse the config.
std::string config_str = UTF16ToUTF8(
- string16(static_cast<char16*>(config), ::SysStringLen(config)));
+ base::string16(static_cast<base::char16*>(config), ::SysStringLen(config)));
scoped_ptr<base::Value> config_value(base::JSONReader::Read(config_str));
if (!config_value.get()) {
return E_FAIL;
diff --git a/remoting/host/win/launch_process_with_token.cc b/remoting/host/win/launch_process_with_token.cc
index f45332c..6cb7e31 100644
--- a/remoting/host/win/launch_process_with_token.cc
+++ b/remoting/host/win/launch_process_with_token.cc
@@ -54,7 +54,7 @@ void CloseHandlesAndTerminateProcess(PROCESS_INFORMATION* process_information) {
// Connects to the executor server corresponding to |session_id|.
bool ConnectToExecutionServer(uint32 session_id,
base::win::ScopedHandle* pipe_out) {
- string16 pipe_name;
+ base::string16 pipe_name;
// Use winsta!WinStationQueryInformationW() to determine the process creation
// pipe name for the session.
@@ -313,7 +313,7 @@ bool SendCreateProcessRequest(
PROCESS_INFORMATION process_information;
};
- string16 desktop;
+ base::string16 desktop;
if (desktop_name)
desktop = desktop_name;
diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc
index 2404e13..2a30cd1 100644
--- a/remoting/host/win/rdp_client_window.cc
+++ b/remoting/host/win/rdp_client_window.cc
@@ -59,7 +59,7 @@ base::LazyInstance<base::ThreadLocalPointer<RdpClientWindow::WindowHook> >
// FindWindowEx() this function walks the tree of windows recursively. The walk
// is done in breadth-first order. The function returns NULL if the child window
// could not be found.
-HWND FindWindowRecursively(HWND parent, const string16& class_name) {
+HWND FindWindowRecursively(HWND parent, const base::string16& class_name) {
std::list<HWND> windows;
windows.push_back(parent);
@@ -69,7 +69,7 @@ HWND FindWindowRecursively(HWND parent, const string16& class_name) {
// See if the window class name matches |class_name|.
WCHAR name[kMaxWindowClassLength];
int length = GetClassName(child, name, arraysize(name));
- if (string16(name, length) == class_name)
+ if (base::string16(name, length) == class_name)
return child;
// Remember the window to look through its children.
diff --git a/remoting/host/win/security_descriptor.cc b/remoting/host/win/security_descriptor.cc
index d7ab6b8..d6c7af0 100644
--- a/remoting/host/win/security_descriptor.cc
+++ b/remoting/host/win/security_descriptor.cc
@@ -32,7 +32,7 @@ std::string ConvertSidToString(SID* sid) {
if (!ConvertSidToStringSid(sid, &c_sid_string))
return std::string();
- string16 sid_string(c_sid_string);
+ base::string16 sid_string(c_sid_string);
LocalFree(c_sid_string);
return UTF16ToUTF8(sid_string);
}