Removes --cloud-print-delete-file.

BUG=350118

Review URL: https://codereview.chromium.org/196863002

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

4 files changed, 9 insertions, 24 deletions

diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc
index 5b67d69..91a0558 100644
--- a/chrome/browser/printing/print_dialog_cloud.cc
+++ b/chrome/browser/printing/print_dialog_cloud.cc
@@ -651,8 +651,7 @@ void CreateDialogForFileImpl(content::BrowserContext* browser_context,
                              const base::FilePath& path_to_file,
                              const base::string16& print_job_title,
                              const base::string16& print_ticket,
-                             const std::string& file_type,
-                             bool delete_on_close) {
+                             const std::string& file_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   scoped_refptr<base::RefCountedMemory> data;
   int64 file_size = 0;
@@ -673,8 +672,7 @@ void CreateDialogForFileImpl(content::BrowserContext* browser_context,
       base::Bind(&print_dialog_cloud::CreatePrintDialogForBytes,
                  browser_context, modal_parent, data, print_job_title,
                  print_ticket, file_type));
-  if (delete_on_close)
-    base::DeleteFile(path_to_file, false);
+  base::DeleteFile(path_to_file, false);
 }
 
 }  // namespace internal_cloud_print_helpers
@@ -700,15 +698,14 @@ void CreatePrintDialogForFile(content::BrowserContext* browser_context,
                               const base::FilePath& path_to_file,
                               const base::string16& print_job_title,
                               const base::string16& print_ticket,
-                              const std::string& file_type,
-                              bool delete_on_close) {
+                              const std::string& file_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&internal_cloud_print_helpers::CreateDialogForFileImpl,
                  browser_context, modal_parent, path_to_file, print_job_title,
-                 print_ticket, file_type, delete_on_close));
+                 print_ticket, file_type));
 }
 
 void CreateCloudPrintSigninTab(Browser* browser,
@@ -761,17 +758,8 @@ bool CreatePrintDialogFromCommandLine(Profile* profile,
             switches::kCloudPrintFileType);
       }
 
-      bool delete_on_close = CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kCloudPrintDeleteFile);
-
-      print_dialog_cloud::CreatePrintDialogForFile(
-          profile,
-          NULL,
-          cloud_print_file,
-          print_job_title,
-          print_job_print_ticket,
-          file_type,
-          delete_on_close);
+      print_dialog_cloud::CreatePrintDialogForFile(profile, NULL,
+          cloud_print_file, print_job_title, print_job_print_ticket, file_type);
       return true;
     }
   }
diff --git a/chrome/browser/printing/print_dialog_cloud.h b/chrome/browser/printing/print_dialog_cloud.h
index 9fbf2c8..9507903 100644
--- a/chrome/browser/printing/print_dialog_cloud.h
+++ b/chrome/browser/printing/print_dialog_cloud.h
@@ -43,8 +43,7 @@ void CreatePrintDialogForFile(content::BrowserContext* browser_context,
                               const base::FilePath& path_to_file,
                               const base::string16& print_job_title,
                               const base::string16& print_ticket,
-                              const std::string& file_type,
-                              bool delete_on_close);
+                              const std::string& file_type);
 
 // Creates a print dialog to print data in RAM.
 // Called on the FILE or UI thread. Even though this may start up a modal
diff --git a/chrome/browser/printing/print_dialog_cloud_internal.h b/chrome/browser/printing/print_dialog_cloud_internal.h
index b344099..d33ba05 100644
--- a/chrome/browser/printing/print_dialog_cloud_internal.h
+++ b/chrome/browser/printing/print_dialog_cloud_internal.h
@@ -194,8 +194,7 @@ void CreateDialogForFileImpl(content::BrowserContext* browser_context,
                              const base::FilePath& path_to_file,
                              const base::string16& print_job_title,
                              const base::string16& print_ticket,
-                             const std::string& file_type,
-                             bool delete_on_close);
+                             const std::string& file_type);
 
 }  // namespace internal_cloud_print_helpers
 
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index 6911cd3..f9fb3ee 100644
--- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc
@@ -246,8 +246,7 @@ void PrintingMessageFilter::CreatePrintDialogForFile(
       path,
       wc->GetTitle(),
       base::string16(),
-      std::string("application/pdf"),
-      false);
+      std::string("application/pdf"));
 }
 #endif  // defined(OS_CHROMEOS)