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

chrome/browser/autocomplete/autocomplete_accessibility.h

-// Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_ACCESSIBILITY_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_ACCESSIBILITY_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <oleacc.h>
 
 #include "base/basictypes.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
 class AutocompleteEditViewWin;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // AutocompleteAccessibility
 //
 // Class implementing the MSAA IAccessible COM interface for
 // AutocompleteEditViewWin, providing accessibility to be used by screen
 // readers and other assistive technology (AT).
@@ skipping 73 matching lines @@
                                 LONG* topic_id);
 
   // Deprecated functions, not implemented here.
   STDMETHODIMP put_accName(VARIANT var_id, BSTR put_name);
   STDMETHODIMP put_accValue(VARIANT var_id, BSTR put_val);
 
  protected:
   // A pointer containing the Windows' default IAccessible implementation for
   // this object. Used where it is acceptable to return default MSAA
   // information.
-  ScopedComPtr<IAccessible> default_accessibility_server_;
+  base::win::ScopedComPtr<IAccessible> default_accessibility_server_;
 
  private:
   const AutocompleteEditViewWin* edit_box_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteAccessibility);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_ACCESSIBILITY_H_