Add ability to get raw data and range requests to to PrivetURLFetcher

chrome/browser/local_discovery/privet_url_fetcher.cc

Index: chrome/browser/local_discovery/privet_url_fetcher.cc
diff --git a/chrome/browser/local_discovery/privet_url_fetcher.cc b/chrome/browser/local_discovery/privet_url_fetcher.cc
index 349555086c6c7c569d022307267fdb998d41b69a..5f7d213e9e50285aa125c9c223b39eb8d6394d73 100644
--- a/chrome/browser/local_discovery/privet_url_fetcher.cc
+++ b/chrome/browser/local_discovery/privet_url_fetcher.cc
@@ -10,6 +10,7 @@
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
+#include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/local_discovery/privet_constants.h"
 #include "content/public/browser/browser_thread.h"
@@ -20,11 +21,21 @@ namespace local_discovery {
 
 namespace {
 const char kXPrivetTokenHeaderPrefix[] = "X-Privet-Token: ";
+const char kRangeHeaderFormat[] = "Range: bytes=%d-%d";
 const char kXPrivetEmptyToken[] = "\"\"";
 const int kPrivetMaxRetries = 20;
 const int kPrivetTimeoutOnError = 5;
+const int kHTTPErrorCodeInvalidXPrivetToken = 418;
+
+std::string MakeRangeHeader(int start, int end) {
+  DCHECK(start >= 0);

[Vitaly Buka (NO REVIEWS), 2014/02/07 19:47:39]

DCHECK_GT?

[Noam Samuel, 2014/02/12 20:25:16]

Done.

+  DCHECK(end > 0);
+  DCHECK(end > start);
+  return base::StringPrintf(kRangeHeaderFormat, start, end);
 }
 
+}  // namespace
+
 void PrivetURLFetcher::Delegate::OnNeedPrivetToken(
     PrivetURLFetcher* fetcher,
     const TokenCallback& callback) {
@@ -40,20 +51,41 @@ PrivetURLFetcher::PrivetURLFetcher(
     : privet_access_token_(token), url_(url), request_type_(request_type),

[Vitaly Buka (NO REVIEWS), 2014/02/07 19:47:39]

one per line might be more readable.

[Noam Samuel, 2014/02/12 20:25:16]

Done.

       request_context_(request_context), delegate_(delegate),
       do_not_retry_on_transient_error_(false), allow_empty_privet_token_(false),
-      tries_(0), weak_factory_(this) {
+      do_not_parse_data_(false), has_byte_range_(false),

[Vitaly Buka (NO REVIEWS), 2014/02/07 19:47:39]

probably do_not_parse_data_ is depends on delegate
so maybe get this from delegate?

[Noam Samuel, 2014/02/12 20:25:16]

Done.

+      make_response_file_(false), byte_range_start_(0),
+      byte_range_end_(0), tries_(0), weak_factory_(this) {
 }
 
 PrivetURLFetcher::~PrivetURLFetcher() {
 }
 
 void PrivetURLFetcher::DoNotRetryOnTransientError() {
+  DCHECK(tries_ == 0);
   do_not_retry_on_transient_error_ = true;
 }
 
 void PrivetURLFetcher::AllowEmptyPrivetToken() {
+  DCHECK(tries_ == 0);
   allow_empty_privet_token_ = true;
 }
 
+void PrivetURLFetcher::DoNotParseData() {
+  DCHECK(tries_ == 0);
+  do_not_parse_data_ = true;
+}
+
+void PrivetURLFetcher::SaveResponseToFile() {
+  DCHECK(tries_ == 0);
+  make_response_file_ = true;
+}
+
+void PrivetURLFetcher::SetByteRange(int start, int end) {
+  DCHECK(tries_ == 0);
+  byte_range_start_ = start;
+  byte_range_end_ = end;
+  has_byte_range_ = true;
+}
+
 void PrivetURLFetcher::Try() {
   tries_++;
   if (tries_ < kPrivetMaxRetries) {
@@ -66,6 +98,16 @@ void PrivetURLFetcher::Try() {
     url_fetcher_->SetRequestContext(request_context_);
     url_fetcher_->AddExtraRequestHeader(std::string(kXPrivetTokenHeaderPrefix) +
                                         token);
+    if (has_byte_range_) {
+      url_fetcher_->AddExtraRequestHeader(
+          MakeRangeHeader(byte_range_start_, byte_range_end_));
+    }
+
+    if (make_response_file_) {
+      url_fetcher_->SaveResponseToTemporaryFile(
+          content::BrowserThread::GetMessageLoopProxyForThread(
+              content::BrowserThread::FILE));
+    }
 
     // URLFetcher requires us to set upload data for POST requests.
     if (request_type_ == net::URLFetcher::POST) {
@@ -91,6 +133,13 @@ void PrivetURLFetcher::Try() {
 void PrivetURLFetcher::Start() {
   DCHECK_EQ(tries_, 0);  // We haven't called |Start()| yet.
 
+  // Byte ranges should only be used when we're not parsing the data
+  // as JSON.
+  DCHECK(!has_byte_range_ || do_not_parse_data_);
+
+  // We should only be saving raw data to a file.
+  DCHECK(!make_response_file_ || do_not_parse_data_);
+
   if (privet_access_token_.empty() && !allow_empty_privet_token_) {
     RequestTokenRefresh();
   } else {
@@ -119,6 +168,49 @@ void PrivetURLFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
     return;
   }
 
+  if (do_not_parse_data_) {
+    OnURLFetchCompleteDoNotParseData(source);
+  } else {
+    OnURLFetchCompleteParseData(source);
+  }
+}
+
+void PrivetURLFetcher::OnURLFetchCompleteDoNotParseData(
+    const net::URLFetcher* source) {
+  if (source->GetResponseCode() == kHTTPErrorCodeInvalidXPrivetToken) {
+    RequestTokenRefresh();
+    return;
+  }
+
+  if (source->GetResponseCode() != net::HTTP_OK &&
+      source->GetResponseCode() != net::HTTP_PARTIAL_CONTENT) {
+    delegate_->OnError(this, RESPONSE_CODE_ERROR);
+    return;
+  }
+
+  if (make_response_file_) {
+    base::FilePath response_file_path;
+
+    if (!source->GetResponseAsFilePath(true, &response_file_path)) {
+      delegate_->OnError(this, URL_FETCH_ERROR);
+      return;
+    }
+
+    delegate_->OnRawData(this, true, std::string(), response_file_path);
+  } else {
+    std::string response_str;
+
+    if (!source->GetResponseAsString(&response_str)) {
+      delegate_->OnError(this, URL_FETCH_ERROR);
+      return;
+    }
+
+    delegate_->OnRawData(this, false, response_str, base::FilePath());
+  }
+}
+
+void PrivetURLFetcher::OnURLFetchCompleteParseData(
+    const net::URLFetcher* source) {
   if (source->GetResponseCode() != net::HTTP_OK) {
     delegate_->OnError(this, RESPONSE_CODE_ERROR);
     return;