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

chrome/browser/accessibility/browser_accessibility_win_unittest.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 "base/memory/scoped_ptr.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "chrome/browser/accessibility/browser_accessibility_manager.h"
 #include "chrome/browser/accessibility/browser_accessibility_win.h"
 #include "content/common/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using webkit_glue::WebAccessibility;
 
 namespace {
 
 // Subclass of BrowserAccessibilityWin that counts the number of instances.
@@ skipping 148 matching lines @@
   CountedBrowserAccessibility::global_obj_count_ = 0;
   BrowserAccessibilityManager* manager =
       BrowserAccessibilityManager::Create(
           GetDesktopWindow(),
           root,
           NULL,
           new CountedBrowserAccessibilityFactory());
 
   // Query for the text IAccessible and verify that it returns "old text" as its
   // value.
-  ScopedComPtr<IDispatch> text_dispatch;
+  base::win::ScopedComPtr<IDispatch> text_dispatch;
   HRESULT hr = manager->GetRoot()->toBrowserAccessibilityWin()->get_accChild(
       CreateI4Variant(1), text_dispatch.Receive());
   ASSERT_EQ(S_OK, hr);
 
-  ScopedComPtr<IAccessible> text_accessible;
+  base::win::ScopedComPtr<IAccessible> text_accessible;
   hr = text_dispatch.QueryInterface(text_accessible.Receive());
   ASSERT_EQ(S_OK, hr);
 
   CComBSTR name;
   hr = text_accessible->get_accName(CreateI4Variant(CHILDID_SELF), &name);
   ASSERT_EQ(S_OK, hr);
   EXPECT_STREQ(L"old text", name.m_str);
 
   text_dispatch.Release();
   text_accessible.Release();
@@ skipping 165 matching lines @@
   ASSERT_EQ(start, 0);
   ASSERT_EQ(end, 13);
   ASSERT_EQ(text, string16(L"One two three"));
   SysFreeString(text);
 
   // Delete the manager and test that all BrowserAccessibility instances are
   // deleted.
   delete manager;
   ASSERT_EQ(0, CountedBrowserAccessibility::global_obj_count_);
 }