Revert changes to DownloadPrefs regarding PDF auto open.

chrome/browser/download/download_prefs.cc

Index: chrome/browser/download/download_prefs.cc
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc
index 61540ec163a5bceabe4bbecb88cb2eaefc808d78..d7fe28e77f509bba5cfc661eb1d8c7b26d660056 100644
--- a/chrome/browser/download/download_prefs.cc
+++ b/chrome/browser/download/download_prefs.cc
@@ -138,9 +138,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profile_(profile) {
 
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
   should_open_pdf_in_system_reader_ =
-      prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader) ||
-      prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
-  disable_adobe_version_check_for_tests_ = false;
+      prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
 #endif
 
   // If the download path is dangerous we forcefully reset it. But if we do
@@ -342,26 +340,22 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
 
 #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
 void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
-  should_open_pdf_in_system_reader_ = should_open ||
-     profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally);
+  if (should_open_pdf_in_system_reader_ == should_open)
+    return;
+  should_open_pdf_in_system_reader_ = should_open;
   profile_->GetPrefs()->SetBoolean(prefs::kOpenPdfDownloadInSystemReader,
                                    should_open);
 }
 
 bool DownloadPrefs::ShouldOpenPdfInSystemReader() const {
 #if defined(OS_WIN)
-  if (!disable_adobe_version_check_for_tests_ &&
-      IsAdobeReaderDefaultPDFViewer() &&
+  if (IsAdobeReaderDefaultPDFViewer() &&
       !DownloadTargetDeterminer::IsAdobeReaderUpToDate()) {
       return false;
   }
 #endif
   return should_open_pdf_in_system_reader_;
 }
-
-void DownloadPrefs::DisableAdobeVersionCheckForTests() {
-  disable_adobe_version_check_for_tests_ = true;
-}
 #endif
 
 void DownloadPrefs::ResetAutoOpen() {