Don't load PPAPI O3D.

BUG=334711
TEST=Build on Chrome OS, check about:plugins, O3D is not there.

Review URL: https://codereview.chromium.org/139733002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245276 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/chrome_content_client.cc

@@ -79,13 +79,6 @@ const char kPnaclPluginMimeType[] = "application/x-pnacl";
 const char kPnaclPluginExtension[] = "";
 const char kPnaclPluginDescription[] = "Portable Native Client Executable";
 
-const char kO3DPluginName[] = "Google Talk Plugin Video Accelerator";
-const char kO3DPluginMimeType[] ="application/vnd.o3d.auto";
-const char kO3DPluginExtension[] = "";
-const char kO3DPluginDescription[] = "O3D MIME";
-const uint32 kO3DPluginPermissions = ppapi::PERMISSION_PRIVATE |
-                                     ppapi::PERMISSION_DEV;
-
 const char kO1DPluginName[] = "Google Talk Plugin Video Renderer";
 const char kO1DPluginMimeType[] ="application/o1d";
 const char kO1DPluginExtension[] = "";
@@ -207,27 +200,6 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
     }
   }
 
-  // TODO(jhorwich|noahric): Remove o3d ppapi code once o3d is replaced
-  // entirely with o1d.
-  static bool skip_o3d_file_check = false;
-  if (PathService::Get(chrome::FILE_O3D_PLUGIN, &path)) {
-    if (skip_o3d_file_check || base::PathExists(path)) {
-      content::PepperPluginInfo o3d;
-      o3d.path = path;
-      o3d.name = kO3DPluginName;
-      o3d.is_out_of_process = true;
-      o3d.is_sandboxed = false;
-      o3d.permissions = kO3DPluginPermissions;
-      content::WebPluginMimeType o3d_mime_type(kO3DPluginMimeType,
-                                               kO3DPluginExtension,
-                                               kO3DPluginDescription);
-      o3d.mime_types.push_back(o3d_mime_type);
-      plugins->push_back(o3d);
-
-      skip_o3d_file_check = true;
-    }
-  }
-
   static bool skip_o1d_file_check = false;
   if (PathService::Get(chrome::FILE_O1D_PLUGIN, &path)) {
     if (skip_o1d_file_check || base::PathExists(path)) {

chrome/common/chrome_paths.cc

@@ -75,9 +75,6 @@ const base::FilePath::CharType kEffectsPluginFileName[] =
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 
-const base::FilePath::CharType kO3DPluginFileName[] =
-    FILE_PATH_LITERAL("pepper/libppo3dautoplugin.so");
-
 const base::FilePath::CharType kO1DPluginFileName[] =
     FILE_PATH_LITERAL("pepper/libppo1d.so");
 
@@ -334,11 +331,6 @@ bool PathProvider(int key, base::FilePath* result) {
       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
       break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-    case chrome::FILE_O3D_PLUGIN:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kO3DPluginFileName);
-      break;
     case chrome::FILE_O1D_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;

chrome/common/chrome_paths.h

@@ -83,7 +83,6 @@ enum {
   DIR_PNACL_BASE,               // Full path to the base dir for PNaCl.
   DIR_PNACL_COMPONENT,          // Full path to the latest PNaCl version
                                 // (subdir of DIR_PNACL_BASE).
-  FILE_O3D_PLUGIN,              // Full path to the O3D Pepper plugin file.
   FILE_O1D_PLUGIN,              // Full path to the O1D Pepper plugin file.
   FILE_EFFECTS_PLUGIN,          // Full path to the Effects Pepper plugin file.
   FILE_GTALK_PLUGIN,            // Full path to the GTalk Pepper plugin file.