Code to accept a print ticket on the command line.

Used for the cloud print virtual drivers. Also modifies the relevant tests.


BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=97442

Review URL: http://codereview.chromium.org/7639024

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

1 files changed, 11 insertions, 3 deletions

diff --git a/chrome/browser/printing/print_dialog_cloud_unittest.cc b/chrome/browser/printing/print_dialog_cloud_unittest.cc
index 327c43c..25b9da9 100644
--- a/chrome/browser/printing/print_dialog_cloud_unittest.cc
+++ b/chrome/browser/printing/print_dialog_cloud_unittest.cc
@@ -41,6 +41,8 @@ static const char* const kPDFTestFile = "printing/cloud_print_unittest.pdf";
 static const char* const kEmptyPDFTestFile =
     "printing/cloud_print_emptytest.pdf";
 static const char* const kMockJobTitle = "Mock Job Title";
+static const char* const kMockPrintTicket = "Resolution=300";
+
 
 FilePath GetTestDataFileName() {
   FilePath test_data_directory;
@@ -84,8 +86,10 @@ class MockCloudPrintFlowHandler
  public:
   MockCloudPrintFlowHandler(const FilePath& path,
                             const string16& title,
-                            const std::string& file_type)
-      : CloudPrintFlowHandler(path, title, file_type) {}
+                            const string16& print_ticket,
+                            const std::string& file_type
+                            )
+      : CloudPrintFlowHandler(path, title, print_ticket, file_type) {}
   MOCK_METHOD0(DestructorCalled, void());
   MOCK_METHOD0(RegisterMessages, void());
   MOCK_METHOD3(Observe,
@@ -217,10 +221,12 @@ class CloudPrintDataSenderTest : public testing::Test {
  protected:
   virtual void SetUp() {
     string16 mock_job_title(ASCIIToUTF16(kMockJobTitle));
+    string16 mock_print_ticket(ASCIIToUTF16(kMockPrintTicket));
     mock_helper_.reset(new MockCloudPrintDataSenderHelper);
     print_data_sender_ =
         new CloudPrintDataSender(mock_helper_.get(),
                                  mock_job_title,
+                                 mock_print_ticket,
                                  std::string("application/pdf"));
   }
 
@@ -296,9 +302,11 @@ class CloudPrintHtmlDialogDelegateTest : public testing::Test {
   virtual void SetUp() {
     FilePath mock_path;
     string16 mock_title;
+    string16 mock_print_ticket;
     std::string mock_file_type;
     MockCloudPrintFlowHandler* handler =
-        new MockCloudPrintFlowHandler(mock_path, mock_title, mock_file_type);
+        new MockCloudPrintFlowHandler(mock_path, mock_print_ticket,
+                                      mock_title, mock_file_type);
     mock_flow_handler_ = handler->AsWeakPtr();
     EXPECT_CALL(*mock_flow_handler_.get(), SetDialogDelegate(_));
     EXPECT_CALL(*mock_flow_handler_.get(), SetDialogDelegate(NULL));