Adds a pref and a policy to decide if PDFs should always be opened externally.

chrome/browser/download/download_prefs.cc

 // Copyright (c) 2012 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 "chrome/browser/download/download_prefs.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 120 matching lines @@
 
   // Ensure that the default download directory exists.
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(base::IgnoreResult(&base::CreateDirectory),
                  GetDefaultDownloadDirectoryForProfile()));
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   should_open_pdf_in_system_reader_ =
-      prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
+      prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) ||
+      prefs->GetBoolean(prefs::kAlwaysOpenPdfExternally);
+  override_adobe_version_check_for_tests_ = false;
 #endif
 
   // If the download path is dangerous we forcefully reset it. But if we do
   // so we set a flag to make sure we only do it once, to avoid fighting
   // the user if he really wants it on an unsafe place such as the desktop.
   if (!prefs->GetBoolean(prefs::kDownloadDirUpgraded)) {
     base::FilePath current_download_dir = prefs->GetFilePath(
         prefs::kDownloadDefaultDirectory);
     if (DownloadPathIsDangerous(current_download_dir)) {
       prefs->SetFilePath(prefs::kDownloadDefaultDirectory,
@@ skipping 181 matching lines @@
   if (extension.empty())
     return;
   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
   extension.erase(0, 1);
   auto_open_.erase(extension);
   SaveAutoOpenState();
 }
 
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
-  if (should_open_pdf_in_system_reader_ == should_open)
-    return;
-  should_open_pdf_in_system_reader_ = should_open;
+  should_open_pdf_in_system_reader_ = should_open ||
+     profile_->GetPrefs()->GetBoolean(prefs::kAlwaysOpenPdfExternally);
   profile_->GetPrefs()->SetBoolean(prefs::kOpenPdfDownloadInSystemReader,
                                    should_open);
 }
 
 bool DownloadPrefs::ShouldOpenPdfInSystemReader() const {
 #if defined(OS_WIN)
-  if (IsAdobeReaderDefaultPDFViewer() &&
+  if (!override_adobe_version_check_for_tests_ &&

[asanka, 2016/09/28 17:27:53]

What should be the non-test behavior if |always_open_pdfs_externally| is set to
true and the Adobe reader is not up-to-date?

[pastarmovj, 2016/09/29 08:40:44]

It will cause a regular file download and let the user open it manually when
finished. This only prevents Chrome from automatically running Adobe Acrobat
Reader upon download completion.

P.S. The windows try bots actually trip over this check so they might be at risk
;)

+      IsAdobeReaderDefaultPDFViewer() &&
       !DownloadTargetDeterminer::IsAdobeReaderUpToDate()) {
       return false;
   }
 #endif
   return should_open_pdf_in_system_reader_;
 }
+
+void DownloadPrefs::OverrideAdobeVersionCheckForTests() {
+  override_adobe_version_check_for_tests_ = true;
+}
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   SetShouldOpenPdfInSystemReader(false);
 #endif
   auto_open_.clear();
   SaveAutoOpenState();
 }
 
@@ skipping 13 matching lines @@
     extensions.erase(extensions.size() - 1);
 
   profile_->GetPrefs()->SetString(prefs::kDownloadExtensionsToOpen, extensions);
 }
 
 bool DownloadPrefs::AutoOpenCompareFunctor::operator()(
     const base::FilePath::StringType& a,
     const base::FilePath::StringType& b) const {
   return base::FilePath::CompareLessIgnoreCase(a, b);
 }