Remove GTalk/O1D plugins and related code

chrome/common/chrome_paths.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_paths.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 57 matching lines @@
 
 const base::FilePath::CharType kEffectsPluginFileName[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("pepper/libppeffects.dll");
 #elif defined(OS_MACOSX)
     FILE_PATH_LITERAL("pepper/libppeffects.plugin");
 #else  // Linux and Chrome OS
     FILE_PATH_LITERAL("pepper/libppeffects.so");
 #endif
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-
-const base::FilePath::CharType kO1DPluginFileName[] =
-    FILE_PATH_LITERAL("pepper/libppo1d.so");
-
-const base::FilePath::CharType kGTalkPluginFileName[] =
-    FILE_PATH_LITERAL("pepper/libppgoogletalk.so");
-
-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-
 #if defined(OS_LINUX)
 // The path to the external extension <id>.json files.
 // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
 const base::FilePath::CharType kFilepathSinglePrefExtensions[] =
 #if defined(GOOGLE_CHROME_BUILD)
     FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
 #else
     FILE_PATH_LITERAL("/usr/share/chromium/extensions");
 #endif  // defined(GOOGLE_CHROME_BUILD)
 #endif  // defined(OS_LINUX)
@@ skipping 270 matching lines @@
         cur = cur.DirName();
         cur = cur.DirName();
         cur = cur.DirName();
       }
 #else
       if (!GetInternalPluginsDirectory(&cur))
         return false;
 #endif
       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
       break;
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
-    case chrome::FILE_O1D_PLUGIN:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kO1DPluginFileName);
-      break;
-    case chrome::FILE_GTALK_PLUGIN:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.Append(kGTalkPluginFileName);
-      break;
-#endif
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 #if defined(WIDEVINE_CDM_IS_COMPONENT)
     case chrome::DIR_COMPONENT_WIDEVINE_CDM:
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(kWidevineCdmBaseDirectory);
       break;
 #endif  // defined(WIDEVINE_CDM_IS_COMPONENT)
     // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
     // In the component case, this is the source adapter. Otherwise, it is the
@@ skipping 214 matching lines @@
 
 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
   g_invalid_specified_user_data_dir.Get() = user_data_dir;
 }
 
 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
   return g_invalid_specified_user_data_dir.Get();
 }
 
 }  // namespace chrome