Remove bundled NPAPI Flash on Windows.

chrome/common/chrome_content_client.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/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 447 matching lines @@
   return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
 }
 
 #if defined(OS_WIN)
 bool ChromeContentClient::SandboxPlugin(CommandLine* command_line,
                                         sandbox::TargetPolicy* policy) {
   std::wstring plugin_dll = command_line->
       GetSwitchValueNative(switches::kPluginPath);
 
   FilePath builtin_flash;
-  if (!PathService::Get(chrome::FILE_FLASH_PLUGIN, &builtin_flash))
+  if (!PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &builtin_flash))
     return false;
 
   FilePath plugin_path(plugin_dll);
   if (plugin_path.BaseName() != builtin_flash.BaseName())
     return false;
 
   if (base::win::GetVersion() <= base::win::VERSION_XP ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableFlashSandbox)) {
     return false;
@@ skipping 62 matching lines @@
 
 bool ChromeContentClient::GetBundledFieldTrialPepperFlash(
     content::PepperPluginInfo* plugin,
     bool* override_npapi_flash) {
   if (!ConductingPepperFlashFieldTrial())
     return false;
   return GetBundledPepperFlash(plugin, override_npapi_flash);
 }
 
 }  // namespace chrome