Include display names in Quirks URL

components/quirks/quirks_manager.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_manager.h"
 
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/format_macros.h"
@@ skipping 96 matching lines @@
     VLOG(2) << clients_.size() << " client(s) deleted.";
     clients_.clear();
   }
 
   for (const std::unique_ptr<QuirksClient>& client : clients_)
     client->StartDownload();
 }
 
 void QuirksManager::RequestIccProfilePath(
     int64_t product_id,
+    const std::string& display_name,
     const RequestFinishedCallback& on_request_finished) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!QuirksEnabled()) {
     VLOG(1) << "Quirks Client disabled.";
     on_request_finished.Run(base::FilePath(), false);
     return;
   }
 
   if (!product_id) {
     VLOG(1) << "Could not determine display information (product id = 0)";
     on_request_finished.Run(base::FilePath(), false);
     return;
   }
 
   std::string name = IdToFileName(product_id);
   base::PostTaskAndReplyWithResult(
       blocking_pool_.get(), FROM_HERE,
       base::Bind(&CheckForIccFile,
                  delegate_->GetDisplayProfileDirectory().Append(name)),
       base::Bind(&QuirksManager::OnIccFilePathRequestCompleted,
-                 weak_ptr_factory_.GetWeakPtr(), product_id,
+                 weak_ptr_factory_.GetWeakPtr(), product_id, display_name,
                  on_request_finished));
 }
 
 void QuirksManager::ClientFinished(QuirksClient* client) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SetLastServerCheck(client->product_id(), base::Time::Now());
   auto it = std::find_if(clients_.begin(), clients_.end(),
                          [client](const std::unique_ptr<QuirksClient>& c) {
                            return c.get() == client;
                          });
   CHECK(it != clients_.end());
   clients_.erase(it);
 }
 
 std::unique_ptr<net::URLFetcher> QuirksManager::CreateURLFetcher(
     const GURL& url,
     net::URLFetcherDelegate* delegate) {
   if (!fake_quirks_fetcher_creator_.is_null())
     return fake_quirks_fetcher_creator_.Run(url, delegate);
 
   return net::URLFetcher::Create(url, net::URLFetcher::GET, delegate);
 }
 
 void QuirksManager::OnIccFilePathRequestCompleted(
     int64_t product_id,
+    const std::string& display_name,
     const RequestFinishedCallback& on_request_finished,
     base::FilePath path) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If we found a file, just inform requester.
   if (!path.empty()) {
     on_request_finished.Run(path, false);
     // TODO(glevin): If Quirks files are ever modified on the server, we'll need
     // to modify this logic to check for updates. See crbug.com/595024.
     return;
@@ skipping 10 matching lines @@
   if (time_since < base::TimeDelta::FromDays(kDaysBetweenServerChecks)) {
     VLOG(2) << time_since.InDays()
             << " days since last Quirks Server check for display "
             << IdToHexString(product_id);
     on_request_finished.Run(base::FilePath(), false);
     return;
   }
 
   // Create and start a client to download file.
   QuirksClient* client =
-      new QuirksClient(product_id, on_request_finished, this);
+      new QuirksClient(product_id, display_name, on_request_finished, this);
   clients_.insert(base::WrapUnique(client));
   if (!waiting_for_login_)
     client->StartDownload();
   else
     VLOG(2) << "Quirks Client created; waiting for login to begin download.";
 }
 
 bool QuirksManager::QuirksEnabled() {
   if (!delegate_->DevicePolicyEnabled()) {
     VLOG(2) << "Quirks Client disabled by device policy.";
     return false;
   }
   return true;
 }
 
 void QuirksManager::SetLastServerCheck(int64_t product_id,
                                        const base::Time& last_check) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DictionaryPrefUpdate dict(local_state_, prefs::kQuirksClientLastServerCheck);
   dict->SetDouble(IdToHexString(product_id), last_check.ToDoubleT());
 }
 
 }  // namespace quirks