Resolve issue from feedback for 1417363004

chrome/browser/local_discovery/privet_url_fetcher.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_url_fetcher.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ skipping 89 matching lines @@
                                        const std::string& token) {
   TokenMapHolder::GetInstance()->map[host] = token;
 }
 
 // static
 void PrivetURLFetcher::ResetTokenMapForTests() {
   TokenMapHolder::GetInstance()->map.clear();
 }
 
 void PrivetURLFetcher::SetMaxRetries(int max_retries) {
-  DCHECK(tries_ == 0);
+  DCHECK_EQ(tries_, 0);
   max_retries_ = max_retries;
 }
 
 void PrivetURLFetcher::DoNotRetryOnTransientError() {
-  DCHECK(tries_ == 0);
+  DCHECK_EQ(tries_, 0);
   do_not_retry_on_transient_error_ = true;
 }
 
 void PrivetURLFetcher::SendEmptyPrivetToken() {
-  DCHECK(tries_ == 0);
+  DCHECK_EQ(tries_, 0);
   send_empty_privet_token_ = true;
 }
 
 std::string PrivetURLFetcher::GetPrivetAccessToken() {
   if (send_empty_privet_token_) {
     return std::string();
   }
 
   TokenMapHolder* token_map_holder = TokenMapHolder::GetInstance();
   TokenMap::iterator found = token_map_holder->map.find(GetHostString());
   return found != token_map_holder->map.end() ? found->second : std::string();
 }
 
 std::string PrivetURLFetcher::GetHostString() {
   return url_.GetOrigin().spec();
 }
 
 void PrivetURLFetcher::SaveResponseToFile() {
-  DCHECK(tries_ == 0);
+  DCHECK_EQ(tries_, 0);
   make_response_file_ = true;
 }
 
 void PrivetURLFetcher::V3Mode() {
   v3_mode_ = true;
 }
 
 void PrivetURLFetcher::SetByteRange(int start, int end) {
-  DCHECK(tries_ == 0);
+  DCHECK_EQ(tries_, 0);
   byte_range_start_ = start;
   byte_range_end_ = end;
   has_byte_range_ = true;
 }
 
 void PrivetURLFetcher::Try() {
   tries_++;
   if (tries_ <= max_retries_) {
-    DVLOG(1) << "Try no. " << tries_;
+    DVLOG(1) << "Try number: " << tries_;

[Aleksey Shlyapnikov, 2015/10/30 21:40:00]

Try number -> Attempt

[Vitaly Buka (NO REVIEWS), 2015/10/30 21:49:32]

Done.

     url_fetcher_ = net::URLFetcher::Create(url_, request_type_, this);
     // Privet requests are relevant to hosts on local network only.
     url_fetcher_->SetLoadFlags(
         url_fetcher_->GetLoadFlags() | net::LOAD_BYPASS_PROXY |
         net::LOAD_DISABLE_CACHE | net::LOAD_DO_NOT_SEND_COOKIES);
     url_fetcher_->SetRequestContext(context_getter_.get());
 
     if (v3_mode_) {
       url_fetcher_->AddExtraRequestHeader(
           std::string(kPrivetV3AuthTokenHeaderPrefix) +
@@ skipping 223 matching lines @@
 }
 
 bool PrivetURLFetcher::PrivetErrorTransient(const std::string& error) {
   return (error == kPrivetErrorDeviceBusy) ||
          (error == kPrivetV3ErrorDeviceBusy) ||
          (error == kPrivetErrorPendingUserAction) ||
          (error == kPrivetErrorPrinterBusy);
 }
 
 }  // namespace local_discovery