Remove GTalk/O1D plugins and related code

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/debug/crash_logging.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 56 matching lines @@
 namespace {
 
 #if defined(ENABLE_PLUGINS)
 const char kPDFPluginExtension[] = "pdf";
 const char kPDFPluginDescription[] = "Portable Document Format";
 const char kPDFPluginOutOfProcessMimeType[] =
     "application/x-google-chrome-pdf";
 const uint32 kPDFPluginPermissions = ppapi::PERMISSION_PRIVATE |
                                      ppapi::PERMISSION_DEV;
 
-const char kO1DPluginName[] = "Google Talk Plugin Video Renderer";
-const char kO1DPluginMimeType[] ="application/o1d";
-const char kO1DPluginExtension[] = "";
-const char kO1DPluginDescription[] = "Google Talk Plugin Video Renderer";
-const uint32 kO1DPluginPermissions = ppapi::PERMISSION_PRIVATE |
-                                     ppapi::PERMISSION_DEV;
-
 const char kEffectsPluginName[] = "Google Talk Effects Plugin";
 const char kEffectsPluginMimeType[] ="application/x-ppapi-hangouts-effects";
 const char kEffectsPluginExtension[] = "";
 const char kEffectsPluginDescription[] = "Google Talk Effects Plugin";
 const uint32 kEffectsPluginPermissions = ppapi::PERMISSION_PRIVATE |
                                          ppapi::PERMISSION_DEV;
 
-const char kGTalkPluginName[] = "Google Talk Plugin";
-const char kGTalkPluginMimeType[] ="application/googletalk";
-const char kGTalkPluginExtension[] = ".googletalk";
-const char kGTalkPluginDescription[] = "Google Talk Plugin";
-const uint32 kGTalkPluginPermissions = ppapi::PERMISSION_PRIVATE |
-                                       ppapi::PERMISSION_DEV;
-
 content::PepperPluginInfo::GetInterfaceFunc g_pdf_get_interface;
 content::PepperPluginInfo::PPP_InitializeModuleFunc g_pdf_initialize_module;
 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_pdf_shutdown_module;
 
 #if defined(ENABLE_REMOTING)
 
 content::PepperPluginInfo::GetInterfaceFunc g_remoting_get_interface;
 content::PepperPluginInfo::PPP_InitializeModuleFunc
     g_remoting_initialize_module;
 content::PepperPluginInfo::PPP_ShutdownModuleFunc g_remoting_shutdown_module;
@@ skipping 69 matching lines @@
                                                nacl::kPnaclPluginDescription);
     nacl.mime_types.push_back(pnacl_mime_type);
     nacl.internal_entry_points.get_interface = g_nacl_get_interface;
     nacl.internal_entry_points.initialize_module = g_nacl_initialize_module;
     nacl.internal_entry_points.shutdown_module = g_nacl_shutdown_module;
     nacl.permissions = ppapi::PERMISSION_PRIVATE | ppapi::PERMISSION_DEV;
     plugins->push_back(nacl);
   }
 #endif  // !defined(DISABLE_NACL)
 
-  static bool skip_o1d_file_check = false;
-  if (PathService::Get(chrome::FILE_O1D_PLUGIN, &path)) {
-    if (skip_o1d_file_check || base::PathExists(path)) {
-      content::PepperPluginInfo o1d;
-      o1d.path = path;
-      o1d.name = kO1DPluginName;
-      o1d.is_out_of_process = true;
-      o1d.is_sandboxed = false;
-      o1d.permissions = kO1DPluginPermissions;
-      content::WebPluginMimeType o1d_mime_type(kO1DPluginMimeType,
-                                               kO1DPluginExtension,
-                                               kO1DPluginDescription);
-      o1d.mime_types.push_back(o1d_mime_type);
-      plugins->push_back(o1d);
-
-      skip_o1d_file_check = true;
-    }
-  }
-
   // TODO(vrk): Remove this when NaCl effects plugin replaces the ppapi effects
   // plugin.
   static bool skip_effects_file_check = false;
   if (PathService::Get(chrome::FILE_EFFECTS_PLUGIN, &path)) {
     if (skip_effects_file_check || base::PathExists(path)) {
       content::PepperPluginInfo effects;
       effects.path = path;
       effects.name = kEffectsPluginName;
       effects.is_out_of_process = true;
-      effects.is_sandboxed = true;
       effects.permissions = kEffectsPluginPermissions;
       content::WebPluginMimeType effects_mime_type(kEffectsPluginMimeType,
                                                    kEffectsPluginExtension,
                                                    kEffectsPluginDescription);
       effects.mime_types.push_back(effects_mime_type);
       plugins->push_back(effects);
 
       skip_effects_file_check = true;
     }
   }
 
-  static bool skip_gtalk_file_check = false;
-  if (PathService::Get(chrome::FILE_GTALK_PLUGIN, &path)) {
-    if (skip_gtalk_file_check || base::PathExists(path)) {
-      content::PepperPluginInfo gtalk;
-      gtalk.path = path;
-      gtalk.name = kGTalkPluginName;
-      gtalk.is_out_of_process = true;
-      gtalk.is_sandboxed = false;
-      gtalk.permissions = kGTalkPluginPermissions;
-      content::WebPluginMimeType gtalk_mime_type(kGTalkPluginMimeType,
-                                                 kGTalkPluginExtension,
-                                                 kGTalkPluginDescription);
-      gtalk.mime_types.push_back(gtalk_mime_type);
-      plugins->push_back(gtalk);
-
-      skip_gtalk_file_check = true;
-    }
-  }
-
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
     !defined(WIDEVINE_CDM_IS_COMPONENT)
   static bool skip_widevine_cdm_file_check = false;
   if (PathService::Get(chrome::FILE_WIDEVINE_CDM_ADAPTER, &path)) {
     if (skip_widevine_cdm_file_check || base::PathExists(path)) {
       content::PepperPluginInfo widevine_cdm;
       widevine_cdm.is_out_of_process = true;
       widevine_cdm.path = path;
       widevine_cdm.name = kWidevineCdmDisplayName;
       widevine_cdm.description = kWidevineCdmDescription +
@@ skipping 368 matching lines @@
     int sandbox_type,
     int* sandbox_profile_resource_id) const {
   DCHECK(sandbox_profile_resource_id);
   if (sandbox_type == NACL_SANDBOX_TYPE_NACL_LOADER) {
     *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
     return true;
   }
   return false;
 }
 #endif