Index: chrome/installer/util/wmi.cc |
diff --git a/chrome/installer/util/wmi.cc b/chrome/installer/util/wmi.cc |
index c625e6bc9c33e4ed620f9ff43de8bb400df91bf1..20c1050600f8c6c5f9f64ed862a755d89e47a06d 100644 |
--- a/chrome/installer/util/wmi.cc |
+++ b/chrome/installer/util/wmi.cc |
@@ -135,10 +135,10 @@ bool WMIProcess::Launch(const std::wstring& command_line, int* process_id) { |
return true; |
} |
-string16 WMIComputerSystem::GetModel() { |
+base::string16 WMIComputerSystem::GetModel() { |
base::win::ScopedComPtr<IWbemServices> services; |
if (!WMI::CreateLocalConnection(true, services.Receive())) |
- return string16(); |
+ return base::string16(); |
base::win::ScopedBstr query_language(L"WQL"); |
base::win::ScopedBstr query(L"SELECT * FROM Win32_ComputerSystem"); |
@@ -148,21 +148,21 @@ string16 WMIComputerSystem::GetModel() { |
WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, |
enumerator.Receive()); |
if (FAILED(hr) || !enumerator) |
- return string16(); |
+ return base::string16(); |
base::win::ScopedComPtr<IWbemClassObject> class_object; |
ULONG items_returned = 0; |
hr = enumerator->Next(WBEM_INFINITE, 1, class_object.Receive(), |
&items_returned); |
if (!items_returned) |
- return string16(); |
+ return base::string16(); |
base::win::ScopedVariant manufacturer; |
class_object->Get(L"Manufacturer", 0, manufacturer.Receive(), 0, 0); |
base::win::ScopedVariant model; |
class_object->Get(L"Model", 0, model.Receive(), 0, 0); |
- string16 model_string; |
+ base::string16 model_string; |
if (manufacturer.type() == VT_BSTR) { |
model_string = V_BSTR(&manufacturer); |
if (model.type() == VT_BSTR) |