Don't load PPAPI O3D.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 534ab66cd73b7cde25caa9f402059719ee3f7613..4461dcf646876b219b0b8a88c73df2a5de8f0dda 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/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)) {