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

chrome/browser/google/google_update.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/google/google_update.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "base/file_path.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/threading/thread.h"
 #include "base/win/registry.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "content/browser/browser_thread.h"
+#include "google_update_idl_i.c"
 #include "views/window/window.h"
-#include "google_update_idl_i.c"
 
 using views::Window;
 
 namespace {
 
 // The registry location of the Google Update policies.
 const wchar_t kGUPolicyRegistrySubKey[] =
     L"SOFTWARE\\Policies\\Google\\Update";
 const wchar_t kGUPolicyGlobalValue[] = L"UpdateDefault";
 const wchar_t kGUPolicyAppValuePrefix[] = L"Update";
@@ skipping 192 matching lines @@
 
  private:
   // The status/result of the Google Update operation.
   GoogleUpdateUpgradeResult result_;
 
   // The version string Google Update found.
   std::wstring new_version_;
 
   // Allows us control the upgrade process to a small degree. After OnComplete
   // has been called, this object can not be used.
-  ScopedComPtr<IProgressWndEvents> event_sink_;
+  base::win::ScopedComPtr<IProgressWndEvents> event_sink_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // GoogleUpdate, public:
 
 GoogleUpdate::GoogleUpdate()
     : listener_(NULL) {
 }
 
 GoogleUpdate::~GoogleUpdate() {
@@ skipping 36 matching lines @@
   }
 
   CComObject<GoogleUpdateJobObserver>* job_observer;
   HRESULT hr =
       CComObject<GoogleUpdateJobObserver>::CreateInstance(&job_observer);
   if (hr != S_OK) {
     return ReportFailure(hr, GOOGLE_UPDATE_JOB_SERVER_CREATION_FAILED,
                          main_loop);
   }
 
-  ScopedComPtr<IJobObserver> job_holder(job_observer);
+  base::win::ScopedComPtr<IJobObserver> job_holder(job_observer);
 
-  ScopedComPtr<IGoogleUpdate> on_demand;
+  base::win::ScopedComPtr<IGoogleUpdate> on_demand;
 
   bool system_level = false;
 
   if (InstallUtil::IsPerUserInstall(chrome_exe.c_str())) {
     hr = on_demand.CreateInstance(CLSID_OnDemandUserAppsClass);
   } else {
     // The Update operation needs Admin privileges for writing
     // to %ProgramFiles%. On Vista we need to elevate before instantiating
     // the updater instance.
     if (!install_if_newer) {
@@ skipping 61 matching lines @@
 }
 
 bool GoogleUpdate::ReportFailure(HRESULT hr, GoogleUpdateErrorCode error_code,
                                  MessageLoop* main_loop) {
   NOTREACHED() << "Communication with Google Update failed: " << hr
                << " error: " << error_code;
   main_loop->PostTask(FROM_HERE, NewRunnableMethod(this,
       &GoogleUpdate::ReportResults, UPGRADE_ERROR, error_code));
   return false;
 }