Fix Cronet mapping of Android log level into Chrome LogSeverity.

components/cronet/android/url_request_peer.cc

 // Copyright 2014 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 "url_request_peer.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "components/cronet/android/url_request_context_peer.h"
 #include "components/cronet/android/wrapped_channel_upload_element_reader.h"
 #include "net/base/load_flags.h"
@@ skipping 68 matching lines @@
       FROM_HERE,
       base::Bind(&URLRequestPeer::OnInitiateConnection,
                  base::Unretained(this)));
 }
 
 void URLRequestPeer::OnInitiateConnection() {
   if (canceled_) {
     return;
   }
 
-  VLOG(context_->logging_level())
-      << "Starting chromium request: " << url_.possibly_invalid_spec().c_str()
-      << " priority: " << RequestPriorityToString(priority_);
+  VLOG(1) << "Starting chromium request: "
+          << url_.possibly_invalid_spec().c_str()
+          << " priority: " << RequestPriorityToString(priority_);
   url_request_ = new net::URLRequest(
       url_, net::DEFAULT_PRIORITY, this, context_->GetURLRequestContext());
   url_request_->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES);
   url_request_->set_method(method_);
   url_request_->SetExtraRequestHeaders(headers_);
   if (!headers_.HasHeader(net::HttpRequestHeaders::kUserAgent)) {
     std::string user_agent;
     user_agent = context_->GetUserAgent(url_);
@@ skipping 15 matching lines @@
   }
 
   canceled_ = true;
 
   context_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&URLRequestPeer::OnCancelRequest, base::Unretained(this)));
 }
 
 void URLRequestPeer::OnCancelRequest() {
-  VLOG(context_->logging_level())
-      << "Canceling chromium request: " << url_.possibly_invalid_spec();
+  VLOG(1) << "Canceling chromium request: " << url_.possibly_invalid_spec();
 
   if (url_request_ != NULL) {
     url_request_->Cancel();
   }
 
   OnRequestCanceled();
 }
 
 void URLRequestPeer::Destroy() {
   context_->GetNetworkTaskRunner()->PostTask(
       FROM_HERE, base::Bind(&URLRequestPeer::OnDestroyRequest, this));
 }
 
 // static
 void URLRequestPeer::OnDestroyRequest(URLRequestPeer* self) {
-  VLOG(self->context_->logging_level())
-      << "Destroying chromium request: " << self->url_.possibly_invalid_spec();
+  VLOG(1) << "Destroying chromium request: "
+          << self->url_.possibly_invalid_spec();
   delete self;
 }
 
 void URLRequestPeer::OnResponseStarted(net::URLRequest* request) {
   if (request->status().status() != net::URLRequestStatus::SUCCESS) {
     OnRequestFailed();
     return;
   }
 
   http_status_code_ = request->GetResponseCode();
-  VLOG(context_->logging_level())
-      << "Response started with status: " << http_status_code_;
+  VLOG(1) << "Response started with status: " << http_status_code_;
 
   request->GetResponseHeaderByName("Content-Type", &content_type_);
   expected_size_ = request->GetExpectedContentSize();
   delegate_->OnResponseStarted(this);
 
   Read();
 }
 
 // Reads all available data or starts an asynchronous read.
 void URLRequestPeer::Read() {
   while (true) {
     if (read_buffer_->RemainingCapacity() == 0) {
       int new_capacity = read_buffer_->capacity() + kBufferSizeIncrement;
       read_buffer_->SetCapacity(new_capacity);
     }
 
     int bytes_read;
     if (url_request_->Read(
             read_buffer_, read_buffer_->RemainingCapacity(), &bytes_read)) {
       if (bytes_read == 0) {
         OnRequestSucceeded();
         break;
       }
 
-      VLOG(context_->logging_level()) << "Synchronously read: " << bytes_read
-                                      << " bytes";
+      VLOG(1) << "Synchronously read: " << bytes_read << " bytes";
       OnBytesRead(bytes_read);
     } else if (url_request_->status().status() ==
                net::URLRequestStatus::IO_PENDING) {
       if (bytes_read_ != 0) {
-        VLOG(context_->logging_level()) << "Flushing buffer: " << bytes_read_
-                                        << " bytes";
+        VLOG(1) << "Flushing buffer: " << bytes_read_ << " bytes";
 
         delegate_->OnBytesRead(this);
         read_buffer_->set_offset(0);
         bytes_read_ = 0;
       }
-      VLOG(context_->logging_level()) << "Started async read";
+      VLOG(1) << "Started async read";
       break;
     } else {
       OnRequestFailed();
       break;
     }
   }
 }
 
 void URLRequestPeer::OnReadCompleted(net::URLRequest* request, int bytes_read) {
-  VLOG(context_->logging_level()) << "Asynchronously read: " << bytes_read
-                                  << " bytes";
+  VLOG(1) << "Asynchronously read: " << bytes_read << " bytes";
   if (bytes_read < 0) {
     OnRequestFailed();
     return;
   } else if (bytes_read == 0) {
     OnRequestSucceeded();
     return;
   }
 
   OnBytesRead(bytes_read);
   Read();
 }
 
 void URLRequestPeer::OnBytesRead(int bytes_read) {
   read_buffer_->set_offset(read_buffer_->offset() + bytes_read);
   bytes_read_ += bytes_read;
   total_bytes_read_ += bytes_read;
 }
 
 void URLRequestPeer::OnRequestSucceeded() {
   if (canceled_) {
     return;
   }
 
-  VLOG(context_->logging_level())
-      << "Request completed with HTTP status: " << http_status_code_
-      << ". Total bytes read: " << total_bytes_read_;
+  VLOG(1) << "Request completed with HTTP status: " << http_status_code_
+          << ". Total bytes read: " << total_bytes_read_;
 
   OnRequestCompleted();
 }
 
 void URLRequestPeer::OnRequestFailed() {
   if (canceled_) {
     return;
   }
 
   error_code_ = url_request_->status().error();
-  VLOG(context_->logging_level())
-      << "Request failed with status: " << url_request_->status().status()
-      << " and error: " << net::ErrorToString(error_code_);
+  VLOG(1) << "Request failed with status: " << url_request_->status().status()
+          << " and error: " << net::ErrorToString(error_code_);
   OnRequestCompleted();
 }
 
 void URLRequestPeer::OnRequestCanceled() { OnRequestCompleted(); }
 
 void URLRequestPeer::OnRequestCompleted() {
-  VLOG(context_->logging_level())
-      << "Completed: " << url_.possibly_invalid_spec();
+  VLOG(1) << "Completed: " << url_.possibly_invalid_spec();
   if (url_request_ != NULL) {
     delete url_request_;
     url_request_ = NULL;
   }
 
   delegate_->OnBytesRead(this);
   delegate_->OnRequestFinished(this);
 }
 
 unsigned char* URLRequestPeer::Data() const {
   return reinterpret_cast<unsigned char*>(read_buffer_->StartOfBuffer());
 }
 
 }  // namespace cronet