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

chrome/browser/shell_integration_win.cc

-// Copyright (c) 2010 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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/create_reg_key_work_item.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
@@ skipping 116 matching lines @@
   // Enumerate all pinned shortcuts in the given path directly.
   file_util::FileEnumerator shortcuts_enum(
       path,
       false,  // not recursive
       file_util::FileEnumerator::FILES,
       FILE_PATH_LITERAL("*.lnk"));
 
   for (FilePath shortcut = shortcuts_enum.Next(); !shortcut.empty();
        shortcut = shortcuts_enum.Next()) {
     // Load the shortcut.
-    ScopedComPtr<IShellLink> shell_link;
+    base::win::ScopedComPtr<IShellLink> shell_link;
     if (FAILED(shell_link.CreateInstance(CLSID_ShellLink,
                                          NULL,
                                          CLSCTX_INPROC_SERVER))) {
       NOTREACHED();
       return;
     }
 
-    ScopedComPtr<IPersistFile> persist_file;
+    base::win::ScopedComPtr<IPersistFile> persist_file;
     if (FAILED(persist_file.QueryFrom(shell_link)) ||
         FAILED(persist_file->Load(shortcut.value().c_str(), STGM_READ))) {
       NOTREACHED();
       return;
     }
 
     // Get expected app id from shortcut.
     std::wstring expected_app_id;
     if (!GetExpectedAppId(shell_link, &expected_app_id) ||
         expected_app_id.empty())
@@ skipping 65 matching lines @@
 }
 
 bool MigrateChromiumShortcutsTask::GetShortcutAppId(
     IShellLink* shell_link,
     std::wstring* app_id) const {
   DCHECK(shell_link);
   DCHECK(app_id);
 
   app_id->clear();
 
-  ScopedComPtr<IPropertyStore> property_store;
+  base::win::ScopedComPtr<IPropertyStore> property_store;
   if (FAILED(property_store.QueryFrom(shell_link)))
     return false;
 
   PROPVARIANT appid_value;
   PropVariantInit(&appid_value);
   if (FAILED(property_store->GetValue(PKEY_AppUserModel_ID,
                                       &appid_value)))
     return false;
 
   if (appid_value.vt == VT_LPWSTR ||
@@ skipping 152 matching lines @@
                   profile_path);
 }
 
 void ShellIntegration::MigrateChromiumShortcuts() {
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE, new MigrateChromiumShortcutsTask());
 }