Revert 184352

chrome/browser/history/history_publisher_win.cc

 // 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.
 
 #include "chrome/browser/history/history_publisher.h"
 
 #include <atlsafe.h>
 #include <oleauto.h>
 #include <wtypes.h>
 
@@ skipping 83 matching lines @@
   double var_time = TimeToUTCVariantTime(page_data.time);
 
   CComSafeArray<unsigned char> thumbnail_arr;
   if (page_data.thumbnail) {
     for (size_t i = 0; i < page_data.thumbnail->size(); ++i)
       thumbnail_arr.Add((*page_data.thumbnail)[i]);
   }
 
   // Send data to registered indexers.
   base::win::ScopedVariant time(var_time, VT_DATE);
-  base::win::ScopedBstr url(base::ASCIIToWide(page_data.url.spec()).c_str());
+  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 base::ASCIIToWide.
+  // Don't send a NULL string through ASCIIToWide.
   base::win::ScopedBstr format(page_data.thumbnail_format ?
-      base::ASCIIToWide(page_data.thumbnail_format).c_str() :
+      ASCIIToWide(page_data.thumbnail_format).c_str() :
       NULL);
   base::win::ScopedVariant psa(thumbnail_arr.m_psa);
   for (size_t i = 0; i < indexers_.size(); ++i) {
     indexers_[i]->SendPageData(time, url, html, title, format, psa);
   }
 }
 
 }  // namespace history