Move pe_image and registry from base to base/win and use the namespace. It re...

chrome/browser/download/download_util.cc

 // Copyright (c) 2010 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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
@@ skipping 54 matching lines @@
 #include "views/widget/widget_gtk.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/custom_drag.h"
 #endif  // defined(TOOLKIT_GTK)
 #endif  // defined(TOOLKIT_USES_GTK)
 
 #if defined(OS_WIN)
 #include "app/os_exchange_data_provider_win.h"
 #include "app/win_util.h"
 #include "base/base_drag_source.h"
-#include "base/registry.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 #include "base/win_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
 
 namespace download_util {
 
 // How many times to cycle the complete animation. This should be an odd number
 // so that the animation ends faded out.
 static const int kCompleteAnimationCycles = 5;
@@ skipping 508 matching lines @@
 
 #if !defined(OS_MACOSX)
 void UpdateAppIconDownloadProgress(int download_count,
                                    bool progress_known,
                                    float progress) {
 #if defined(OS_WIN)
   // Taskbar progress bar is only supported on Win7.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
-  ScopedComPtr<ITaskbarList3> taskbar;
+  base::win::ScopedComPtr<ITaskbarList3> taskbar;
   HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
                                           CLSCTX_INPROC_SERVER);
   if (FAILED(result)) {
     LOG(INFO) << "failed creating a TaskbarList object: " << result;
     return;
   }
 
   result = taskbar->HrInit();
   if (FAILED(result)) {
     LOG(ERROR) << "failed initializing an ITaskbarList3 interface.";
@@ skipping 110 matching lines @@
     ExtensionsService* service = profile->GetExtensionsService();
     if (!service ||
         !service->IsDownloadFromGallery(info->url, info->referrer_url)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace download_util