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

chrome/browser/platform_util_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/platform_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "app/win/scoped_co_mem.h"
 #include "app/win/shell.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/logging.h"
 #include "base/path_service.h"
-#include "base/logging.h"
-#include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
+#include "base/win/scoped_comptr.h"
+#include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/message_box_win.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   FilePath dir = full_path.DirName();
   // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
@@ skipping 23 matching lines @@
     }
     open_folder_and_select_itemsPtr =
         reinterpret_cast<SHOpenFolderAndSelectItemsFuncPtr>
             (GetProcAddress(shell32_base, "SHOpenFolderAndSelectItems"));
   }
   if (!open_folder_and_select_itemsPtr) {
     ShellExecute(NULL, L"open", dir.value().c_str(), NULL, NULL, SW_SHOW);
     return;
   }
 
-  ScopedComPtr<IShellFolder> desktop;
+  base::win::ScopedComPtr<IShellFolder> desktop;
   HRESULT hr = SHGetDesktopFolder(desktop.Receive());
   if (FAILED(hr))
     return;
 
   app::win::ScopedCoMem<ITEMIDLIST> dir_item;
   hr = desktop->ParseDisplayName(NULL, NULL,
                                  const_cast<wchar_t *>(dir.value().c_str()),
                                  NULL, &dir_item, NULL);
   if (FAILED(hr))
     return;
@@ skipping 126 matching lines @@
 
     GoogleUpdateSettings::GetChromeChannel(is_system_install, &channel);
   }
   return UTF16ToASCII(channel);
 #else
   return std::string();
 #endif
 }
 
 }  // namespace platform_util