Cleanup: Remove unneeded scoped_ptr.h includes from ppapi, printing, remoting, and sync.

BUG=none
TEST=none
TBR=brettw,hclam,akalin,abodenha

Review URL: https://chromiumcodereview.appspot.com/10387107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137376 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 34 insertions, 35 deletions

diff --git a/printing/backend/win_helper.cc b/printing/backend/win_helper.cc
index 9166c96..5980291 100644
--- a/printing/backend/win_helper.cc
+++ b/printing/backend/win_helper.cc
@@ -9,52 +9,53 @@
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/print_backend_consts.h"
 
 namespace {
-typedef HRESULT (WINAPI *PTOpenProviderProc)(PCWSTR printer_name,
+typedef HRESULT (WINAPI* PTOpenProviderProc)(PCWSTR printer_name,
                                              DWORD version,
-                                             HPTPROVIDER *provider);
-typedef HRESULT (WINAPI *PTGetPrintCapabilitiesProc)(HPTPROVIDER provider,
-                                                     IStream *print_ticket,
-                                                     IStream *capabilities,
+                                             HPTPROVIDER* provider);
+typedef HRESULT (WINAPI* PTGetPrintCapabilitiesProc)(HPTPROVIDER provider,
+                                                     IStream* print_ticket,
+                                                     IStream* capabilities,
                                                      BSTR* error_message);
-typedef HRESULT (WINAPI *PTConvertDevModeToPrintTicketProc)(
+typedef HRESULT (WINAPI* PTConvertDevModeToPrintTicketProc)(
     HPTPROVIDER provider,
     ULONG devmode_size_in_bytes,
     PDEVMODE devmode,
     EPrintTicketScope scope,
     IStream* print_ticket);
-typedef HRESULT (WINAPI *PTConvertPrintTicketToDevModeProc)(
+typedef HRESULT (WINAPI* PTConvertPrintTicketToDevModeProc)(
     HPTPROVIDER provider,
     IStream* print_ticket,
     EDefaultDevmodeType base_devmode_type,
     EPrintTicketScope scope,
     ULONG* devmode_byte_count,
-    PDEVMODE *devmode,
+    PDEVMODE* devmode,
     BSTR* error_message);
-typedef HRESULT (WINAPI *PTMergeAndValidatePrintTicketProc)(
+typedef HRESULT (WINAPI* PTMergeAndValidatePrintTicketProc)(
     HPTPROVIDER provider,
     IStream* base_ticket,
     IStream* delta_ticket,
     EPrintTicketScope scope,
     IStream* result_ticket,
     BSTR* error_message);
-typedef HRESULT (WINAPI *PTReleaseMemoryProc)(PVOID buffer);
-typedef HRESULT (WINAPI *PTCloseProviderProc)(HPTPROVIDER provider);
-typedef HRESULT (WINAPI *StartXpsPrintJobProc)(
+typedef HRESULT (WINAPI* PTReleaseMemoryProc)(PVOID buffer);
+typedef HRESULT (WINAPI* PTCloseProviderProc)(HPTPROVIDER provider);
+typedef HRESULT (WINAPI* StartXpsPrintJobProc)(
     const LPCWSTR printer_name,
     const LPCWSTR job_name,
     const LPCWSTR output_file_name,
     HANDLE progress_event,
     HANDLE completion_event,
-    UINT8 *printable_pages_on,
+    UINT8* printable_pages_on,
     UINT32 printable_pages_on_count,
-    IXpsPrintJob **xps_print_job,
-    IXpsPrintJobStream **document_stream,
-    IXpsPrintJobStream **print_ticket_stream);
+    IXpsPrintJob** xps_print_job,
+    IXpsPrintJobStream** document_stream,
+    IXpsPrintJobStream** print_ticket_stream);
 
 PTOpenProviderProc g_open_provider_proc = NULL;
 PTGetPrintCapabilitiesProc g_get_print_capabilities_proc = NULL;
@@ -107,7 +108,7 @@ const DRIVER_INFO_6* GetDriverInfo6(HANDLE printer,
   return reinterpret_cast<const DRIVER_INFO_6*>(buffer->get());
 }
 
-}
+}  // namespace
 
 namespace printing {
 
@@ -172,13 +173,13 @@ bool XPSModule::InitImpl() {
 
 HRESULT XPSModule::OpenProvider(const string16& printer_name,
                                 DWORD version,
-                                HPTPROVIDER *provider) {
+                                HPTPROVIDER* provider) {
   return g_open_provider_proc(printer_name.c_str(), version, provider);
 }
 
 HRESULT XPSModule::GetPrintCapabilities(HPTPROVIDER provider,
-                                        IStream *print_ticket,
-                                        IStream *capabilities,
+                                        IStream* print_ticket,
+                                        IStream* capabilities,
                                         BSTR* error_message) {
   return g_get_print_capabilities_proc(provider,
                                        print_ticket,
@@ -204,7 +205,7 @@ HRESULT XPSModule::ConvertPrintTicketToDevMode(
     EDefaultDevmodeType base_devmode_type,
     EPrintTicketScope scope,
     ULONG* devmode_byte_count,
-    PDEVMODE *devmode,
+    PDEVMODE* devmode,
     BSTR* error_message) {
   return g_convert_print_ticket_to_devmode_proc(provider,
                                                 print_ticket,
@@ -293,11 +294,11 @@ HRESULT XPSPrintModule::StartXpsPrintJob(
     const LPCWSTR output_file_name,
     HANDLE progress_event,
     HANDLE completion_event,
-    UINT8 *printable_pages_on,
+    UINT8* printable_pages_on,
     UINT32 printable_pages_on_count,
-    IXpsPrintJob **xps_print_job,
-    IXpsPrintJobStream **document_stream,
-    IXpsPrintJobStream **print_ticket_stream) {
+    IXpsPrintJob** xps_print_job,
+    IXpsPrintJobStream** document_stream,
+    IXpsPrintJobStream** print_ticket_stream) {
   return g_start_xps_print_job_proc(printer_name,
                                     job_name,
                                     output_file_name,
diff --git a/printing/backend/win_helper.h b/printing/backend/win_helper.h
index 7c35cbe..87cae3c 100644
--- a/printing/backend/win_helper.h
+++ b/printing/backend/win_helper.h
@@ -13,7 +13,6 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/win/scoped_handle.h"
 #include "printing/printing_export.h"
@@ -58,10 +57,10 @@ class PRINTING_EXPORT XPSModule {
   static bool Init();
   static HRESULT OpenProvider(const string16& printer_name,
                               DWORD version,
-                              HPTPROVIDER *provider);
+                              HPTPROVIDER* provider);
   static HRESULT GetPrintCapabilities(HPTPROVIDER provider,
-                                      IStream *print_ticket,
-                                      IStream *capabilities,
+                                      IStream* print_ticket,
+                                      IStream* capabilities,
                                       BSTR* error_message);
   static HRESULT ConvertDevModeToPrintTicket(HPTPROVIDER provider,
                                              ULONG devmode_size_in_bytes,
@@ -74,7 +73,7 @@ class PRINTING_EXPORT XPSModule {
       EDefaultDevmodeType base_devmode_type,
       EPrintTicketScope scope,
       ULONG* devmode_byte_count,
-      PDEVMODE *devmode,
+      PDEVMODE* devmode,
       BSTR* error_message);
   static HRESULT MergeAndValidatePrintTicket(HPTPROVIDER provider,
                                              IStream* base_ticket,
@@ -84,6 +83,7 @@ class PRINTING_EXPORT XPSModule {
                                              BSTR* error_message);
   static HRESULT ReleaseMemory(PVOID buffer);
   static HRESULT CloseProvider(HPTPROVIDER provider);
+
  private:
   XPSModule() { }
   static bool InitImpl();
@@ -115,7 +115,7 @@ class PRINTING_EXPORT XPSPrintModule {
       const LPCWSTR output_file_name,
       HANDLE progress_event,
       HANDLE completion_event,
-      UINT8 *printable_pages_on,
+      UINT8* printable_pages_on,
       UINT32 printable_pages_on_count,
       IXpsPrintJob **xps_print_job,
       IXpsPrintJobStream **document_stream,
diff --git a/printing/print_settings.h b/printing/print_settings.h
index 44d6aa5..8026cbc 100644
--- a/printing/print_settings.h
+++ b/printing/print_settings.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "printing/page_range.h"
 #include "printing/page_setup.h"
diff --git a/printing/printed_document.h b/printing/printed_document.h
index 3a61541..bdb092f 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "printing/print_settings.h"