Added the ability to set the upload file path

chrome/browser/local_discovery/privet_http_impl.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 "chrome/browser/local_discovery/privet_http_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 471 matching lines @@
 
   if (offline_) {
     url = net::AppendQueryParameter(url,
                                     kPrivetURLKeyOffline,
                                     kPrivetURLValueOffline);
   }
 
   url_fetcher_= privet_client_->CreateURLFetcher(
       url, net::URLFetcher::POST, this);
 
-  DCHECK(!data_.empty());
-  url_fetcher_->SetUploadData(
-      use_pdf_ ? kPrivetContentTypePDF : kPrivetContentTypePWGRaster,
-      data_);
+  std::string content_type =
+      use_pdf_ ? kPrivetContentTypePDF : kPrivetContentTypePWGRaster;
+
+  DCHECK(!data_.empty() || !data_file_.empty());
+
+  if (!data_file_.empty()) {
+    url_fetcher_->SetUploadFilePath(

[gene, 2013/11/14 00:52:14]

nit: fit on one line

[Noam Samuel, 2013/11/14 19:05:57]

Done.

+        content_type,
+        data_file_);
+  } else {
+    url_fetcher_->SetUploadData(

[gene, 2013/11/14 00:52:14]

nit: fit on one line

[Noam Samuel, 2013/11/14 19:05:57]

Done.

+        content_type,
+        data_);
+  }
 
   url_fetcher_->Start();
 }
 
 void PrivetLocalPrintOperationImpl::OnCapabilitiesResponse(
     bool has_error,
     const base::DictionaryValue* value) {
   if (has_error) {
     delegate_->OnPrivetPrintingError(this, 200);
     return;
@@ skipping 100 matching lines @@
 }
 
 void PrivetLocalPrintOperationImpl::OnNeedPrivetToken(
     PrivetURLFetcher* fetcher,
     const PrivetURLFetcher::TokenCallback& callback) {
   privet_client_->RefreshPrivetToken(callback);
 }
 
 void PrivetLocalPrintOperationImpl::SendData(const std::string& data) {
   DCHECK(started_);
+  DCHECK(data_file_.empty());
   data_ = data;
 
-  if (has_extended_workflow_ && !ticket_.empty()) {
-    DoCreatejob();
-  } else {
-    DoSubmitdoc();
-  }
+  SendDataInternal();
+}
+
+void PrivetLocalPrintOperationImpl::SendDataFile(
+    const base::FilePath& data_file) {
+  DCHECK(started_);
+  DCHECK(data_.empty());
+  data_file_ = data_file;
+
+  SendDataInternal();
 }
 
 void PrivetLocalPrintOperationImpl::SetTicket(const std::string& ticket) {
   DCHECK(!started_);
   ticket_ = ticket;
 }
 
 void PrivetLocalPrintOperationImpl::SetUsername(const std::string& user) {
   DCHECK(!started_);
   user_= user;
 }
 
 void PrivetLocalPrintOperationImpl::SetJobname(const std::string& jobname) {
   DCHECK(!started_);
   jobname_ = jobname;
 }
 
 void PrivetLocalPrintOperationImpl::SetOffline(bool offline) {
   DCHECK(!started_);
   offline_ = offline;
 }
 
+void PrivetLocalPrintOperationImpl::SendDataInternal() {
+  if (has_extended_workflow_ && !ticket_.empty()) {
+    DoCreatejob();
+  } else {
+    DoSubmitdoc();
+  }
+}
+
 PrivetHTTPClientImpl::PrivetHTTPClientImpl(
     const std::string& name,
     const net::HostPortPair& host_port,
     net::URLRequestContextGetter* request_context)
     : name_(name),
       fetcher_factory_(request_context),
       host_port_(host_port) {
 }
 
 PrivetHTTPClientImpl::~PrivetHTTPClientImpl() {
@@ skipping 85 matching lines @@
   TokenCallbackVector token_callbacks;
   token_callbacks_.swap(token_callbacks);
 
   for (TokenCallbackVector::iterator i = token_callbacks.begin();
        i != token_callbacks.end(); i++) {
     i->Run(token);
   }
 }
 
 }  // namespace local_discovery