Don't use command line flags for enabling the internal pdf plugin. Instead, ...

chrome/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/field_trial.h"
 #include "base/histogram.h"
+#include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/common/appcache/appcache_dispatcher.h"
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/child_process_logging.h"
+#include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/page_zoom.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/window_container_type.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/audio_message_filter.h"
@@ skipping 3059 matching lines @@
   WebFrame* main_frame = webview()->mainFrame();
   if (main_frame)
     policy_url = main_frame->url();
 
   FilePath path;
   render_thread_->Send(new ViewHostMsg_GetPluginPath(
       url, policy_url, mime_type, &path, actual_mime_type));
   if (path.value().empty())
     return NULL;
 
+  FilePath internal_pdf_path;
+  PathService::Get(chrome::FILE_PDF_PLUGIN, &internal_pdf_path);
+
   const std::string* mime_type_to_use;
   if (!actual_mime_type->empty())
     mime_type_to_use = actual_mime_type;
   else
     mime_type_to_use = &mime_type;
 
   bool use_pepper_host = false;
   bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();
   // Check for trusted Pepper plugins.
   const char kPepperPrefix[] = "pepper-";
   if (StartsWithASCII(*mime_type_to_use, kPepperPrefix, true)) {
     if (CommandLine::ForCurrentProcess()->
             HasSwitch(switches::kInternalPepper)) {
       in_process_plugin = true;
       use_pepper_host = true;
     } else {
       // In process Pepper plugins must be explicitly enabled.
       return NULL;
     }
-  } else if (CommandLine::ForCurrentProcess()->
-                HasSwitch(switches::kInternalPDF) &&
-             StartsWithASCII(*mime_type_to_use, "application/pdf", true)) {
+  } else if (path == internal_pdf_path) {
     in_process_plugin = true;
     use_pepper_host = true;
   }
   // Check for Native Client modules.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInternalNaCl)) {
     if (mime_type == "application/x-nacl-srpc") {
       in_process_plugin = true;
       use_pepper_host = true;
     }
   }
@@ skipping 1823 matching lines @@
 
     if (last_top_level_navigation_page_id_ != page_id_ &&
         // Not interested in reloads.
         type != WebKit::WebNavigationTypeReload &&
         type != WebKit::WebNavigationTypeFormSubmitted) {
       return true;
     }
   }
   return false;
 }