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

Also add base::win:: to ScopedComPtr where necessary.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/5625006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68910 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/views/controls/button/native_button_win.cc b/views/controls/button/native_button_win.cc
index 5aac782..71434e0 100644
--- a/views/controls/button/native_button_win.cc
+++ b/views/controls/button/native_button_win.cc
@@ -8,7 +8,7 @@
 #include <oleacc.h>
 
 #include "base/logging.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win_util.h"
 #include "base/win/windows_version.h"
 #include "views/controls/button/checkbox.h"
@@ -73,7 +73,7 @@ void NativeButtonWin::UpdateDefault() {
 void NativeButtonWin::UpdateAccessibleName() {
   std::wstring name;
   if (native_button_->GetAccessibleName(&name)) {
-    ScopedComPtr<IAccPropServices> pAccPropServices;
+    base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
     HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
         IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
     if (SUCCEEDED(hr)) {
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 3f4b0eb..d559592 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -116,7 +116,7 @@ NativeTextfieldWin::NativeTextfieldWin(Textfield* textfield)
   }
 
   // Set up the text_object_model_.
-  ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
+  base::win::ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
   ole_interface.Attach(GetOleInterface());
   if (ole_interface)
     text_object_model_.QueryFrom(ole_interface);
@@ -358,7 +358,7 @@ void NativeTextfieldWin::InitializeAccessibilityInfo() {
   // Set the accessible state.
   accessibility_state_ = 0;
 
-  ScopedComPtr<IAccPropServices> pAccPropServices;
+  base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
   HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
       IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
   if (!SUCCEEDED(hr))
@@ -390,7 +390,7 @@ void NativeTextfieldWin::InitializeAccessibilityInfo() {
 
 void NativeTextfieldWin::UpdateAccessibleState(uint32 state_flag,
                                                bool set_value) {
-  ScopedComPtr<IAccPropServices> pAccPropServices;
+  base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
   HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
       IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
   if (!SUCCEEDED(hr))
@@ -408,7 +408,7 @@ void NativeTextfieldWin::UpdateAccessibleState(uint32 state_flag,
 }
 
 void NativeTextfieldWin::UpdateAccessibleValue(const std::wstring& value) {
-  ScopedComPtr<IAccPropServices> pAccPropServices;
+  base::win::ScopedComPtr<IAccPropServices> pAccPropServices;
   HRESULT hr = CoCreateInstance(CLSID_AccPropServices, NULL, CLSCTX_SERVER,
       IID_IAccPropServices, reinterpret_cast<void**>(&pAccPropServices));
   if (!SUCCEEDED(hr))
@@ -1046,7 +1046,7 @@ void NativeTextfieldWin::SetContainsMouse(bool contains_mouse) {
 
 ITextDocument* NativeTextfieldWin::GetTextObjectModel() const {
   if (!text_object_model_) {
-    ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
+    base::win::ScopedComPtr<IRichEditOle, &IID_IRichEditOle> ole_interface;
     ole_interface.Attach(GetOleInterface());
     if (ole_interface)
       text_object_model_.QueryFrom(ole_interface);
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index b01b87e..5dc882f 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -16,7 +16,7 @@
 #include <vsstyle.h>
 
 #include "app/menus/simple_menu_model.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "gfx/insets.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
 
@@ -236,7 +236,7 @@ class NativeTextfieldWin
   gfx::Insets content_insets_;
 
   // This interface is useful for accessing the CRichEditCtrl at a low level.
-  mutable ScopedComPtr<ITextDocument> text_object_model_;
+  mutable base::win::ScopedComPtr<ITextDocument> text_object_model_;
 
   // The position and the length of the ongoing composition string.
   // These values are used for removing a composition string from a search