Added the ability to set the upload file path

chrome/browser/local_discovery/privet_http_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/local_discovery/privet_http_impl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 192 matching lines @@
         net::HostPortPair("10.0.0.8", 6006),
         request_context_.get()));
     fetcher_factory_.SetDelegateForTests(&fetcher_delegate_);
   }
 
   virtual ~PrivetHTTPTest() {
   }
 
   bool SuccessfulResponseToURL(const GURL& url,
                                const std::string& response) {
-    return SuccessfulResponseToURLAndData(url, "", response);
-  }
-
-  bool SuccessfulResponseToURLAndData(const GURL& url,
-                                      const std::string& data,
-                                      const std::string& response) {
     net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0);
     EXPECT_TRUE(fetcher);
     EXPECT_EQ(url, fetcher->GetOriginalURL());
 
-    if (!data.empty()) {
-      EXPECT_EQ(data, fetcher->upload_data());
-    }
-
-    if (!fetcher || url != fetcher->GetOriginalURL() ||
-        (!data.empty() && data != fetcher->upload_data()))
+    if (!fetcher || url != fetcher->GetOriginalURL())
       return false;
 
     fetcher->SetResponseString(response);
     fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS,
                                               net::OK));
     fetcher->set_response_code(200);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
     return true;
   }
 
+  bool SuccessfulResponseToURLAndData(const GURL& url,
+                                      const std::string& data,
+                                      const std::string& response) {
+    net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0);
+    EXPECT_TRUE(fetcher);
+    EXPECT_EQ(url, fetcher->GetOriginalURL());
+
+    if (!fetcher) return false;
+
+    EXPECT_EQ(data, fetcher->upload_data());
+    if (data != fetcher->upload_data()) return false;
+
+    return SuccessfulResponseToURL(url, response);
+  }
+
+  bool SuccessfulResponseToURLAndFilePath(const GURL& url,
+                                          const base::FilePath& file_path,
+                                          const std::string& response) {
+    net::TestURLFetcher* fetcher = fetcher_factory_.GetFetcherByID(0);
+    EXPECT_TRUE(fetcher);
+    EXPECT_EQ(url, fetcher->GetOriginalURL());
+
+    if (!fetcher) return false;
+
+    EXPECT_EQ(file_path, fetcher->upload_file_path());
+    if (file_path != fetcher->upload_file_path()) return false;
+
+    return SuccessfulResponseToURL(url, response);
+  }
+
+
   void RunFor(base::TimeDelta time_period) {
     base::CancelableCallback<void()> callback(base::Bind(
         &PrivetHTTPTest::Stop, base::Unretained(this)));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, callback.callback(), time_period);
 
     base::MessageLoop::current()->Run();
     callback.Cancel();
   }
 
@@ skipping 579 matching lines @@
       GURL("http://10.0.0.8:6006/privet/info"),
       kSampleInfoResponse));
 
   EXPECT_CALL(local_print_delegate_,
               OnPrivetPrintingRequestPWGRasterInternal());
 
   EXPECT_TRUE(SuccessfulResponseToURL(
       GURL("http://10.0.0.8:6006/privet/capabilities"),
       kSampleCapabilitiesResponsePWGOnly));
 
-  local_print_operation_->SendData("Sample print data");
+  local_print_operation_->SendDataFile(base::FilePath("sample/file/path"));
 
   EXPECT_CALL(local_print_delegate_, OnPrivetPrintingDoneInternal());
 
   // TODO(noamsml): Is encoding spaces as pluses standard?
-  EXPECT_TRUE(SuccessfulResponseToURLAndData(
+  EXPECT_TRUE(SuccessfulResponseToURLAndFilePath(
       GURL("http://10.0.0.8:6006/privet/printer/submitdoc?"
            "user=sample%40gmail.com&jobname=Sample+job+name"),
-      "Sample print data",
+      base::FilePath("sample/file/path"),
       kSampleLocalPrintResponse));
 };
 
 TEST_F(PrivetLocalPrintTest, SuccessfulLocalPrintWithCreatejob) {
   local_print_operation_->SetUsername("sample@gmail.com");
   local_print_operation_->SetJobname("Sample job name");
   local_print_operation_->SetTicket("Sample print ticket");
   local_print_operation_->Start();
 
   EXPECT_TRUE(SuccessfulResponseToURL(
@@ skipping 56 matching lines @@
 
   EXPECT_TRUE(SuccessfulResponseToURL(
       GURL("http://10.0.0.8:6006/privet/printer/createjob"),
       kSampleCreatejobResponse));
 };
 
 
 }  // namespace
 
 }  // namespace local_discovery