Revert 90464 - Move app/win/* files to base/win/, ui/base/win and chrome/common/ directories.

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/utility/utility_thread.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
+#include "app/win/iat_patch_function.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/win/iat_patch_function.h"
 #include "base/win/scoped_handle.h"
 #include "content/common/content_switches.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "printing/emf_win.h"
 #endif  // defined(OS_WIN)
 
 namespace chrome {
 
 ChromeContentUtilityClient::ChromeContentUtilityClient() {
 }
@@ skipping 147 matching lines @@
     int bounds_width, int bounds_height, bool fit_to_bounds,
     bool stretch_to_bounds, bool keep_aspect_ratio, bool center_in_bounds);
 
 typedef bool (*GetPDFDocInfoProc)(const unsigned char* pdf_buffer,
                                   int buffer_size, int* page_count,
                                   double* max_page_width);
 
 // The 2 below IAT patch functions are almost identical to the code in
 // render_process_impl.cc. This is needed to work around specific Windows APIs
 // used by the Chrome PDF plugin that will fail in the sandbox.
-static base::win::IATPatchFunction g_iat_patch_createdca;
+static app::win::IATPatchFunction g_iat_patch_createdca;
 HDC WINAPI UtilityProcess_CreateDCAPatch(LPCSTR driver_name,
                                          LPCSTR device_name,
                                          LPCSTR output,
                                          const DEVMODEA* init_data) {
   if (driver_name &&
       (std::string("DISPLAY") == std::string(driver_name)))
   // CreateDC fails behind the sandbox, but not CreateCompatibleDC.
     return CreateCompatibleDC(NULL);
 
   NOTREACHED();
   return CreateDCA(driver_name, device_name, output, init_data);
 }
 
-static base::win::IATPatchFunction g_iat_patch_get_font_data;
+static app::win::IATPatchFunction g_iat_patch_get_font_data;
 DWORD WINAPI UtilityProcess_GetFontDataPatch(
     HDC hdc, DWORD table, DWORD offset, LPVOID buffer, DWORD length) {
   int rv = GetFontData(hdc, table, offset, buffer, length);
   if (rv == GDI_ERROR && hdc) {
     HFONT font = static_cast<HFONT>(GetCurrentObject(hdc, OBJ_FONT));
 
     LOGFONT logfont;
     if (GetObject(font, sizeof(LOGFONT), &logfont)) {
       std::vector<char> font_data;
       if (UtilityThread::current()->Send(
@@ skipping 119 matching lines @@
   if (print_backend->GetPrinterCapsAndDefaults(printer_name, &printer_info)) {
     Send(new UtilityHostMsg_GetPrinterCapsAndDefaults_Succeeded(printer_name,
                                                                 printer_info));
   } else {
     Send(new UtilityHostMsg_GetPrinterCapsAndDefaults_Failed(printer_name));
   }
   UtilityThread::current()->ReleaseProcessIfNeeded();
 }
 
 }  // namespace chrome