Add automated tests for PDFs.

chrome/browser/plugin_updater.cc

 // Copyright (c) 2010 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/plugin_updater.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 114 matching lines @@
     // This DCHECK guards against us disabling/enabling the pdf plugin more than
     // once without renaming the flag that tells us whether we can enable it
     // automatically.  Each time we disable the plugin by default after it was
     // enabled by default, we need to rename that flag.
     DCHECK(!profile->GetPrefs()->GetBoolean(prefs::kPluginsEnabledInternalPDF));
   }
 
   bool found_internal_pdf = false;
   bool force_enable_internal_pdf = false;
   string16 pdf_group_name = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
+  bool force_internal_pdf_for_this_run = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kForceInternalPDFPlugin);
   FilePath pdf_path;
   PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path);
   FilePath::StringType pdf_path_str = pdf_path.value();
   if (enable_internal_pdf_ &&
       !profile->GetPrefs()->GetBoolean(prefs::kPluginsEnabledInternalPDF)) {
     // We switched to the internal pdf plugin being on by default, and so we
     // need to force it to be enabled.  We only want to do it this once though,
     // i.e. we don't want to enable it again if the user disables it afterwards.
     profile->GetPrefs()->SetBoolean(prefs::kPluginsEnabledInternalPDF, true);
     force_enable_internal_pdf = true;
@@ skipping 25 matching lines @@
                 last_internal_dir.value()) == 0) {
           // If the internal plugin directory has changed and if the plugin
           // looks internal, update its path in the prefs.
           plugin_path = cur_internal_dir.Append(plugin_path.BaseName());
           path = plugin_path.value();
           plugin->SetString("path", path);
         }
 
         if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) {
           found_internal_pdf = true;
-          if (!enabled && force_enable_internal_pdf) {
-            enabled = true;
-            plugin->SetBoolean("enabled", true);
+          if (!enabled) {
+            if (force_enable_internal_pdf) {
+              enabled = true;
+              plugin->SetBoolean("enabled", true);
+            } else if (force_internal_pdf_for_this_run) {
+              enabled = true;
+            }
           }
         }
         if (!enabled)
           NPAPI::PluginList::Singleton()->DisablePlugin(plugin_path);
       } else if (!enabled && plugin->GetString("name", &group_name)) {
         // Don't disable this group if it's for the pdf plugin and we just
         // forced it on.
         if (force_enable_internal_pdf && pdf_group_name == group_name)
           continue;
 
         // Otherwise this is a list of groups.
         EnablePluginGroup(false, group_name);
       }
     }
   }
 
   // Build the set of policy-disabled plugin patterns once and cache it.
   // Don't do this in the constructor, there's no profile available there.
   const ListValue* plugin_blacklist =
       profile->GetPrefs()->GetList(prefs::kPluginsPluginsBlacklist);
   DisablePluginsFromPolicy(plugin_blacklist);
 
-  if (!enable_internal_pdf_ && !found_internal_pdf) {
+  if ((!enable_internal_pdf_ && !found_internal_pdf) &&
+      !force_internal_pdf_for_this_run) {
     // The internal PDF plugin is disabled by default, and the user hasn't
     // overridden the default.
     NPAPI::PluginList::Singleton()->DisablePlugin(pdf_path);
     EnablePluginGroup(false, pdf_group_name);
   }
 
   if (force_enable_internal_pdf) {
     // See http://crbug.com/50105 for background.
     EnablePluginGroup(false, ASCIIToUTF16(PluginGroup::kAdobeReader8GroupName));
     EnablePluginGroup(false, ASCIIToUTF16(PluginGroup::kAdobeReader9GroupName));
@@ skipping 70 matching lines @@
   NotificationService::current()->Notify(
       NotificationType::PLUGIN_ENABLE_STATUS_CHANGED,
       Source<PluginUpdater>(GetPluginUpdater()),
       NotificationService::NoDetails());
 }
 
 /*static*/
 PluginUpdater* PluginUpdater::GetPluginUpdater() {
   return Singleton<PluginUpdater>::get();
 }