ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h

chrome_frame/utils.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_FRAME_UTILS_H_
 #define CHROME_FRAME_UTILS_H_
 
 #include <OAidl.h>
 #include <windows.h>
 #include <wininet.h>
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/thread.h"
+#include "base/win/scoped_comptr.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 class FilePath;
 interface IBrowserService;
 
 // utils.h : Various utility functions and classes
 
 extern const wchar_t kChromeContentPrefix[];
 extern const char kGCFProtocol[];
@@ skipping 251 matching lines @@
 // - RENDERER_TYPE_CHROME_OPT_IN_URL
 RendererType RendererTypeForUrl(const std::wstring& url);
 
 // A shortcut for QueryService
 template <typename T>
 HRESULT DoQueryService(const IID& service_id, IUnknown* unk, T** service) {
   DCHECK(service);
   if (!unk)
     return E_INVALIDARG;
 
-  ScopedComPtr<IServiceProvider> service_provider;
+  base::win::ScopedComPtr<IServiceProvider> service_provider;
   HRESULT hr = service_provider.QueryFrom(unk);
   if (service_provider)
     hr = service_provider->QueryService(service_id, service);
 
   DCHECK(FAILED(hr) || *service);
   return hr;
 }
 
 // Navigates an IWebBrowser2 object to a moniker.
 // |headers| can be NULL.
@@ skipping 53 matching lines @@
 }
 
 // See COM_INTERFACE_ENTRY_IF_DELEGATE_SUPPORTS below for details.
 template <class T>
 STDMETHODIMP QueryInterfaceIfDelegateSupports(void* obj, REFIID iid,
                                               void** ret, DWORD cookie) {
   HRESULT hr = E_NOINTERFACE;
   T* instance = reinterpret_cast<T*>(obj);
   IUnknown* delegate = instance ? instance->delegate() : NULL;
   if (delegate) {
-    ScopedComPtr<IUnknown> original;
+    base::win::ScopedComPtr<IUnknown> original;
     hr = delegate->QueryInterface(iid,
                                   reinterpret_cast<void**>(original.Receive()));
     if (original) {
       IUnknown* supported_interface = reinterpret_cast<IUnknown*>(
           reinterpret_cast<DWORD_PTR>(obj) + cookie);
       supported_interface->AddRef();
       *ret = supported_interface;
       hr = S_OK;
     }
   }
@@ skipping 232 matching lines @@
 //
 // The string is first interpreted using ';' as a delimiter. It is reevaluated
 // using ',' iff no valid 'chrome=' value is found.
 bool CheckXUaCompatibleDirective(const std::string& directive,
                                  int ie_major_version);
 
 // Returns the version of the current module as a string.
 std::wstring GetCurrentModuleVersion();
 
 #endif  // CHROME_FRAME_UTILS_H_