Remove built-in path check from Quirks

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 13 matching lines @@
 
 namespace {
 
 QuirksManager* manager_ = nullptr;
 
 const char kIccExtension[] = ".icc";
 
 // How often we query Quirks Server.
 const int kDaysBetweenServerChecks = 30;
 
-// Check if file exists, VLOG results.
-bool CheckAndLogFile(const base::FilePath& path) {
+// Check if QuirksClient has already downloaded icc file from server.
+base::FilePath CheckForIccFile(base::FilePath path) {

[oshima, 2016/10/24 17:36:32]

nit: const &

   const bool exists = base::PathExists(path);
   VLOG(1) << (exists ? "File" : "No File") << " found at " << path.value();
   // TODO(glevin): If file exists, do we want to implement a hash to verify that
   // the file hasn't been corrupted or tampered with?
-  return exists;
-}
-
-base::FilePath CheckForIccFile(base::FilePath built_in_path,
-                               base::FilePath download_path,
-                               bool quirks_enabled) {
-  // First, look for icc file in old read-only location.  If there, we don't use
-  // the Quirks server.
-  if (CheckAndLogFile(built_in_path))
-    return built_in_path;
-
-  // If experimental Quirks flag isn't set, no other icc file is available.
-  if (!quirks_enabled) {
-    VLOG(1) << "Quirks Client disabled, no built-in icc file available.";
-    return base::FilePath();
-  }
-
-  // Check if QuirksClient has already downloaded icc file from server.
-  if (CheckAndLogFile(download_path))
-    return download_path;
-
-  return base::FilePath();
+  return exists ? path : base::FilePath();
 }
 
 }  // namespace
 
 std::string IdToHexString(int64_t product_id) {
   return base::StringPrintf("%08" PRIx64, product_id);
 }
 
 std::string IdToFileName(int64_t product_id) {
   return IdToHexString(product_id).append(kIccExtension);
@@ skipping 58 matching lines @@
 
   for (const std::unique_ptr<QuirksClient>& client : clients_)
     client->StartDownload();
 }
 
 void QuirksManager::RequestIccProfilePath(
     int64_t product_id,
     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_->GetBuiltInDisplayProfileDirectory().Append(name),
-                 delegate_->GetDownloadDisplayProfileDirectory().Append(name),
-                 QuirksEnabled()),
+                 delegate_->GetDisplayProfileDirectory().Append(name)),
       base::Bind(&QuirksManager::OnIccFilePathRequestCompleted,
                  weak_ptr_factory_.GetWeakPtr(), product_id,
                  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) {
@@ skipping 11 matching lines @@
 
   return net::URLFetcher::Create(url, net::URLFetcher::GET, delegate);
 }
 
 void QuirksManager::OnIccFilePathRequestCompleted(
     int64_t product_id,
     const RequestFinishedCallback& on_request_finished,
     base::FilePath path) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  // If we found a file or client is disabled, inform requester.
-  if (!path.empty() || !QuirksEnabled()) {
+  // 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;
   }
 
   double last_check = 0.0;
   local_state_->GetDictionary(prefs::kQuirksClientLastServerCheck)
       ->GetDouble(IdToHexString(product_id), &last_check);
 
@@ skipping 28 matching lines @@
 }
 
 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