Index: chrome/browser/component_updater/background_downloader_win.cc |
diff --git a/chrome/browser/component_updater/background_downloader_win.cc b/chrome/browser/component_updater/background_downloader_win.cc |
index cb02663b737f14bcb8dd17ee56b1a0d034764a05..66a17960680d18cdf759e243a26bed6b3801cc19 100644 |
--- a/chrome/browser/component_updater/background_downloader_win.cc |
+++ b/chrome/browser/component_updater/background_downloader_win.cc |
@@ -96,7 +96,7 @@ namespace { |
// All jobs created by this module have a specific description so they can |
// be found at run-time or by using system administration tools. |
-const char16 kJobDescription[] = L"Chrome Component Updater"; |
+const base::char16 kJobDescription[] = L"Chrome Component Updater"; |
// How often the code looks for changes in the BITS job state. |
const int kJobPollingIntervalSec = 10; |
@@ -167,7 +167,7 @@ HRESULT GetJobFileProperties(IBackgroundCopyFile* file, |
HRESULT hr = S_OK; |
if (local_name) { |
- ScopedCoMem<char16> name; |
+ ScopedCoMem<base::char16> name; |
hr = file->GetLocalName(&name); |
if (FAILED(hr)) |
return hr; |
@@ -175,7 +175,7 @@ HRESULT GetJobFileProperties(IBackgroundCopyFile* file, |
} |
if (remote_name) { |
- ScopedCoMem<char16> name; |
+ ScopedCoMem<base::char16> name; |
hr = file->GetRemoteName(&name); |
if (FAILED(hr)) |
return hr; |
@@ -194,7 +194,7 @@ HRESULT GetJobFileProperties(IBackgroundCopyFile* file, |
} |
HRESULT GetJobDescription(IBackgroundCopyJob* job, const base::string16* name) { |
- ScopedCoMem<char16> description; |
+ ScopedCoMem<base::char16> description; |
return job->GetDescription(&description); |
} |
@@ -288,7 +288,7 @@ bool JobFileUrlEqual::operator()(IBackgroundCopyJob* job, |
return false; |
for (size_t i = 0; i != files.size(); ++i) { |
- ScopedCoMem<char16> name; |
+ ScopedCoMem<base::char16> name; |
if (SUCCEEDED(files[i]->GetRemoteName(&name)) && |
remote_name.compare(name) == 0) |
return true; |