[Autofill] Re-introduce some debug logs for Autofill queries.

components/autofill/core/browser/autofill_download_manager.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 "components/autofill/core/browser/autofill_download_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 73 matching lines @@
   }
   NOTREACHED();
   return std::string();
 }
 
 GURL GetRequestUrl(AutofillDownloadManager::RequestType request_type) {
   return GURL("https://clients1.google.com/tbproxy/af/" +
               RequestTypeToString(request_type) + "?client=" + kClientName);
 }
 
+std::ostream& operator<<(std::ostream& s,

[Roger McFarlane (Chromium), 2016/01/22 21:52:30]

maybe rename s to out or stream

[Mathieu, 2016/01/22 22:15:12]

Done.

+                         const autofill::AutofillQueryContents& query) {
+  s << "client_version: " << query.client_version();
+  for (const auto& form : query.form()) {
+    s << "\nForm\n signature: " << form.signature();
+    for (const auto& field : form.field()) {
+      s << "\n Field"
+        << "\n  signature: " << field.signature();

[Roger McFarlane (Chromium), 2016/01/22 21:52:30]

nit: will this fit merged with the previous line?

[Mathieu, 2016/01/22 22:15:12]

Done.

+      if (!field.name().empty())
+        s << "\n  name: " << field.name();
+      if (!field.type().empty())
+        s << "\n  type: " << field.type();
+      if (!field.label().empty())
+        s << "\n  label: " << field.label();
+    }
+  }
+  return s;
+}
+
+std::ostream& operator<<(std::ostream& s,
+                         const autofill::AutofillUploadContents& upload) {
+  s << "client_version: " << upload.client_version() << "\n";
+  s << "form_signature: " << upload.form_signature() << "\n";
+  s << "data_present: " << upload.data_present() << "\n";
+  s << "submission: " << upload.submission() << "\n";
+  if (!upload.action_signature())
+    s << "action_signature: " << upload.action_signature() << "\n";
+  if (!upload.login_form_signature())
+    s << "login_form_signature: " << upload.login_form_signature() << "\n";
+  if (!upload.form_name().empty())
+    s << "form_name: " << upload.form_name() << "\n";
+
+  for (const auto& field : upload.field()) {
+    s << "\n Field"
+      << "\n signature: " << field.signature()
+      << "\n autofill_type: " << field.autofill_type();

[Roger McFarlane (Chromium), 2016/01/22 21:52:30]

this is a number or a string?

FieldType_Name(field.autofill_type()) ?

[Mathieu, 2016/01/22 22:15:12]

Unfortunately it's not a proto in Chromium, it's a number

+    if (!field.name().empty())
+      s << "\n name: " << field.name();
+    if (!field.autocomplete().empty())
+      s << "\n autocomplete: " << field.autocomplete();
+    if (!field.type().empty())
+      s << "\n type: " << field.type();
+    if (!field.label().empty())
+      s << "\n label: " << field.label();
+  }
+  return s;
+}
+
 }  // namespace
 
 struct AutofillDownloadManager::FormRequestData {
   std::vector<std::string> form_signatures;
   RequestType request_type;
   std::string payload;
 };
 
 AutofillDownloadManager::AutofillDownloadManager(AutofillDriver* driver,
                                                  Observer* observer)
@@ skipping 36 matching lines @@
   std::string query_data;
   if (CheckCacheForQueryRequest(request_data.form_signatures, &query_data)) {
     VLOG(1) << "AutofillDownloadManager: query request has been retrieved "
              << "from the cache, form signatures: "
              << GetCombinedSignature(request_data.form_signatures);
     observer_->OnLoadedServerPredictions(std::move(query_data),
                                          request_data.form_signatures);
     return true;
   }
 
+  VLOG(1) << "Sending Autofill Query Request:\n" << query;
+
   return StartRequest(request_data);
 }
 
 bool AutofillDownloadManager::StartUploadRequest(
     const FormStructure& form,
     bool form_was_autofilled,
     const ServerFieldTypeSet& available_field_types,
     const std::string& login_form_signature,
     bool observed_submission) {
   AutofillUploadContents upload;
@@ skipping 10 matching lines @@
     VLOG(1) << "AutofillDownloadManager: Upload request is ignored.";
     // If we ever need notification that upload was skipped, add it here.
     return false;
   }
 
   FormRequestData request_data;
   request_data.form_signatures.push_back(form.FormSignature());
   request_data.request_type = AutofillDownloadManager::REQUEST_UPLOAD;
   request_data.payload = payload;
 
+  VLOG(1) << "Sending Autofill Upload Request:\n" << upload;
+
   return StartRequest(request_data);
 }
 
 bool AutofillDownloadManager::StartRequest(
     const FormRequestData& request_data) {
   net::URLRequestContextGetter* request_context =
       driver_->GetURLRequestContext();
   DCHECK(request_context);
   GURL request_url = GetRequestUrl(request_data.request_type);
 
@@ skipping 23 matching lines @@
   fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                         net::LOAD_DO_NOT_SEND_COOKIES);
   // Add Chrome experiment state and GZIP encoding to the request headers.
   net::HttpRequestHeaders headers;
   headers.SetHeaderIfMissing("content-encoding", "gzip");
   variations::AppendVariationHeaders(
       fetcher->GetOriginalURL(), driver_->IsOffTheRecord(), false, &headers);
   fetcher->SetExtraRequestHeaders(headers.ToString());
   fetcher->Start();
 
-  VLOG(1) << "Sending AutofillDownloadManager "
-          << RequestTypeToString(request_data.request_type)
-          << " request (compressed to " << compression_ratio << "%)";
-
   return true;
 }
 
 void AutofillDownloadManager::CacheQueryRequest(
     const std::vector<std::string>& forms_in_query,
     const std::string& query_data) {
   std::string signature = GetCombinedSignature(forms_in_query);
   for (auto it = cached_forms_.begin(); it != cached_forms_.end(); ++it) {
     if (it->first == signature) {
       // We hit the cache, move to the first position and return.
@@ skipping 83 matching lines @@
                                            it->second.form_signatures);
     } else {
       observer_->OnUploadedPossibleFieldTypes();
     }
   }
   delete it->first;
   url_fetchers_.erase(it);
 }
 
 }  // namespace autofill