Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

chrome/browser/history/history_publisher_win.cc

Index: chrome/browser/history/history_publisher_win.cc
diff --git a/chrome/browser/history/history_publisher_win.cc b/chrome/browser/history/history_publisher_win.cc
index f54be582197c64bd3ba4f6462275d2a81be49fcf..51c72a62235aaf9c6d4864c1b7a08759854784a7 100644
--- a/chrome/browser/history/history_publisher_win.cc
+++ b/chrome/browser/history/history_publisher_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -18,9 +18,6 @@
 #include "base/win/scoped_variant.h"
 #include "googleurl/src/gurl.h"
 
-using base::win::ScopedVariant;
-using base::win::ScopedBstr;
-
 namespace {
 
 // Instantiates a IChromeHistoryIndexer COM object. Takes a COM class id
@@ -43,12 +40,13 @@ bool CoCreateIndexerFromName(const wchar_t* name,
 // Instantiates the registered indexers from the registry |root| + |path| key
 // and adds them to the |indexers| list.
 void AddRegisteredIndexers(HKEY root, const wchar_t* path,
-    std::vector< ScopedComPtr<IChromeHistoryIndexer> >* indexers) {
+    std::vector< base::win::ScopedComPtr<IChromeHistoryIndexer> >* indexers) {
   IChromeHistoryIndexer* indexer;
   base::win::RegistryKeyIterator r_iter(root, path);
   while (r_iter.Valid()) {
     if (CoCreateIndexerFromName(r_iter.Name(), &indexer)) {
-      indexers->push_back(ScopedComPtr<IChromeHistoryIndexer>(indexer));
+      indexers->push_back(
+          base::win::ScopedComPtr<IChromeHistoryIndexer>(indexer));
       indexer->Release();
     }
     ++r_iter;
@@ -120,11 +118,11 @@ void HistoryPublisher::PublishDataToIndexers(const PageData& page_data)
 
   // Send data to registered indexers.
   base::win::ScopedVariant time(var_time, VT_DATE);
-  ScopedBstr url(ASCIIToWide(page_data.url.spec()).c_str());
-  ScopedBstr html(page_data.html);
-  ScopedBstr title(page_data.title);
+  base::win::ScopedBstr url(ASCIIToWide(page_data.url.spec()).c_str());
+  base::win::ScopedBstr html(page_data.html);
+  base::win::ScopedBstr title(page_data.title);
   // Don't send a NULL string through ASCIIToWide.
-  ScopedBstr format(page_data.thumbnail_format ?
+  base::win::ScopedBstr format(page_data.thumbnail_format ?
       ASCIIToWide(page_data.thumbnail_format).c_str() :
       NULL);
   base::win::ScopedVariant psa(thumbnail_arr.m_psa);