Include display names in Quirks URL

components/quirks/quirks_client.cc

 // Copyright 2016 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/quirks/quirks_client.h"
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/quirks/quirks_manager.h"
 #include "components/version_info/version_info.h"
+#include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace quirks {
 
 namespace {
 
 const char kQuirksUrlFormat[] =
     "https://chromeosquirksserver-pa.googleapis.com/v2/display/%s/clients"
-    "/chromeos/M%d";
+    "/chromeos/M%d?";
 
 const int kMaxServerFailures = 10;
 
 const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
     1,                // Initial errors before applying backoff
     10000,            // 10 seconds.
     2,                // Factor by which the waiting time will be multiplied.
     0,                // Random fuzzing percentage.
     1000 * 3600 * 6,  // Max wait between requests = 6 hours.
     -1,               // Don't discard entry.
     true,             // Use initial delay after first error.
 };
 
 bool WriteIccFile(const base::FilePath file_path, const std::string& data) {
   int bytes_written = base::WriteFile(file_path, data.data(), data.length());
   if (bytes_written == -1)
     LOG(ERROR) << "Write failed: " << file_path.value() << ", err = " << errno;
   else
     VLOG(1) << bytes_written << "bytes written to: " << file_path.value();
 
   return (bytes_written != -1);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // QuirksClient
 
 QuirksClient::QuirksClient(int64_t product_id,
+                           const std::string& display_name,
                            const RequestFinishedCallback& on_request_finished,
                            QuirksManager* manager)
     : product_id_(product_id),
+      display_name_(display_name),
       on_request_finished_(on_request_finished),
       manager_(manager),
       icc_path_(manager->delegate()->GetDisplayProfileDirectory().Append(
           IdToFileName(product_id))),
       backoff_entry_(&kDefaultBackoffPolicy),
       weak_ptr_factory_(this) {}
 
 QuirksClient::~QuirksClient() {}
 
 void QuirksClient::StartDownload() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // URL of icc file on Quirks Server.
   int major_version = atoi(version_info::GetVersionNumber().c_str());
   std::string url = base::StringPrintf(
       kQuirksUrlFormat, IdToHexString(product_id_).c_str(), major_version);
 
+  if (!display_name_.empty()) {
+    url +=
+        "display_name=" + net::EscapeQueryParamValue(display_name_, true) + "&";
+  }
+
   VLOG(2) << "Preparing to download\n  " << url << "\nto file "
           << icc_path_.value();
 
-  url += "?key=";
-  url += manager_->delegate()->GetApiKey();
+  url += "key=" + manager_->delegate()->GetApiKey();
 
   url_fetcher_ = manager_->CreateURLFetcher(GURL(url), this);
   url_fetcher_->SetRequestContext(manager_->url_context_getter());
   url_fetcher_->SetLoadFlags(net::LOAD_BYPASS_CACHE | net::LOAD_DISABLE_CACHE |
                              net::LOAD_DO_NOT_SAVE_COOKIES |
                              net::LOAD_DO_NOT_SEND_COOKIES |
                              net::LOAD_DO_NOT_SEND_AUTH_DATA);
   url_fetcher_->Start();
 }
 
@@ skipping 78 matching lines @@
 
   if (!base::Base64Decode(data64, data)) {
     VLOG(1) << "Failed to decode Base64 icc data";
     return false;
   }
 
   return true;
 }
 
 }  // namespace quirks