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

chrome/browser/autocomplete/autocomplete_edit_view_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/autocomplete/autocomplete_edit_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 732 matching lines @@
 }
 
 IAccessible* AutocompleteEditViewWin::GetIAccessible() {
   if (!autocomplete_accessibility_) {
     CComObject<AutocompleteAccessibility>* accessibility = NULL;
     if (!SUCCEEDED(CComObject<AutocompleteAccessibility>::CreateInstance(
             &accessibility)) || !accessibility)
       return NULL;
 
     // Wrap the created object in a smart pointer so it won't leak.
-    ScopedComPtr<IAccessible> accessibility_comptr(accessibility);
+    base::win::ScopedComPtr<IAccessible> accessibility_comptr(accessibility);
     if (!SUCCEEDED(accessibility->Initialize(this)))
       return NULL;
 
     // Copy to the class smart pointer, and notify that an instance of
     // IAccessible was allocated for m_hWnd.
     autocomplete_accessibility_ = accessibility_comptr;
     NotifyWinEvent(EVENT_OBJECT_CREATE, m_hWnd, OBJID_CLIENT, CHILDID_SELF);
   }
   // Detach to leave ref counting to the caller.
   return autocomplete_accessibility_.Detach();
@@ skipping 1304 matching lines @@
   }
 }
 
 void AutocompleteEditViewWin::GetSelection(CHARRANGE& sel) const {
   GetSel(sel);
 
   // See if we need to reverse the direction of the selection.
   ITextDocument* const text_object_model = GetTextObjectModel();
   if (!text_object_model)
     return;
-  ScopedComPtr<ITextSelection> selection;
+  base::win::ScopedComPtr<ITextSelection> selection;
   const HRESULT hr = text_object_model->GetSelection(selection.Receive());
   DCHECK_EQ(S_OK, hr);
   long flags;
   selection->GetFlags(&flags);
   if (flags & tomSelStartActive)
     std::swap(sel.cpMin, sel.cpMax);
 }
 
 string16 AutocompleteEditViewWin::GetSelectedText() const {
   // Figure out the length of the selection.
   CHARRANGE sel;
   GetSel(sel);
 
   // Grab the selected text.
   string16 str;
   GetSelText(WriteInto(&str, sel.cpMax - sel.cpMin + 1));
   return str;
 }
 
 void AutocompleteEditViewWin::SetSelection(LONG start, LONG end) {
   SetSel(start, end);
 
   if (start <= end)
     return;
 
   // We need to reverse the direction of the selection.
   ITextDocument* const text_object_model = GetTextObjectModel();
   if (!text_object_model)
     return;
-  ScopedComPtr<ITextSelection> selection;
+  base::win::ScopedComPtr<ITextSelection> selection;
   const HRESULT hr = text_object_model->GetSelection(selection.Receive());
   DCHECK_EQ(S_OK, hr);
   selection->SetFlags(tomSelStartActive);
 }
 
 void AutocompleteEditViewWin::PlaceCaretAt(string16::size_type pos) {
   SetSelection(static_cast<LONG>(pos), static_cast<LONG>(pos));
 }
 
 bool AutocompleteEditViewWin::IsSelectAllForRange(const CHARRANGE& sel) const {
@@ skipping 290 matching lines @@
 }
 
 bool AutocompleteEditViewWin::CanPasteAndGo(const string16& text) const {
   return !popup_window_mode_ && model_->CanPasteAndGo(text);
 }
 
 ITextDocument* AutocompleteEditViewWin::GetTextObjectModel() const {
   if (!text_object_model_) {
     // This is lazily initialized, instead of being initialized in the
     // constructor, in order to avoid hurting startup performance.
-    ScopedComPtr<IRichEditOle, NULL> ole_interface;
+    base::win::ScopedComPtr<IRichEditOle, NULL> ole_interface;
     ole_interface.Attach(GetOleInterface());
     if (ole_interface) {
       ole_interface.QueryInterface(
           __uuidof(ITextDocument),
           reinterpret_cast<void**>(&text_object_model_));
     }
   }
   return text_object_model_;
 }
 
@@ skipping 190 matching lines @@
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }
 
 bool AutocompleteEditViewWin::IsCaretAtEnd() const {
   long length = GetTextLength();
   CHARRANGE sel;
   GetSelection(sel);
   return sel.cpMin == sel.cpMax && sel.cpMin == length;
 }