From 00ffe5dd99527a0cb1035af6749417f5fb1c134e Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 13 May 2009 17:52:48 +0000
Subject: Revert 15965. I wasn't supposed to check that in since it still
 doesn't compile on linux and mac!

TBR=sky
Review URL: http://codereview.chromium.org/113351

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15967 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/history/history_publisher_win.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '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 ef4fb7f..72c0f1d 100644
--- a/chrome/browser/history/history_publisher_win.cc
+++ b/chrome/browser/history/history_publisher_win.cc
@@ -10,11 +10,10 @@
 #include <wtypes.h>
 
 #include "base/registry.h"
-#include "base/scoped_comptr_win.h"
 
 namespace history {
 
-const wchar_t* const HistoryPublisher::kRegKeyRegisteredIndexersInfo =
+const wchar_t* HistoryPublisher::kRegKeyRegisteredIndexersInfo =
     L"Software\\Google\\Google Chrome\\IndexerPlugins";
 
 // static
@@ -61,7 +60,7 @@ bool HistoryPublisher::ReadRegisteredIndexersFromRegistry() {
     CLSID clsid;
     CLSIDFromString(static_cast<LPOLESTR>(
         const_cast<TCHAR*>(iter.Name())), &clsid);
-    ScopedComPtr<IChromeHistoryIndexer> indexer;
+    CComPtr<IChromeHistoryIndexer> indexer;
     HRESULT hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC,
                                   __uuidof(IChromeHistoryIndexer),
                                   reinterpret_cast<void**>(&indexer));
-- 
cgit v1.1