commit 0f1b563c614e8703c3c2d278068e6e7e152d827d
author Ilja H. Friedel <ihf@chromium.org> Fri Oct 16 18:45:23 2020 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 22 16:29:23 2020 +0000
tree 79c91c06c625fb8c40b4f6e706db84250277b25e
parent 90fdd2e1b41e587ab6a53d12684096942738dd18

libchromeos-ui: remove Adobe Flash/plugin registration

Also remove LC_ALL which was used for Flash only.

BUG=chromium:1084315
TEST=CQ will test.

Exempt-From-Owner-Approval: trivial/TBR
Change-Id: Ie569da351184ac37ff87bbd5d4f4f5e018bcad2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2481979
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>

libchromeos-ui/chromeos/ui/chromium_command_builder.cc

diff --git a/libchromeos-ui/chromeos/ui/chromium_command_builder.cc b/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
index 9cd0f9b..ae9c6b1 100644
--- a/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
+++ b/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
@@ -169,7 +169,6 @@
   AddEnvVar("LOGNAME", kUser);
   AddEnvVar("SHELL", "/bin/sh");
   AddEnvVar("PATH", "/bin:/usr/bin");
-  AddEnvVar("LC_ALL", "en_US.utf8");
   AddEnvVar("XDG_RUNTIME_DIR", "/run/chrome");
 
   const base::FilePath data_dir(GetPath("/home").Append(kUser));
@@ -479,33 +478,21 @@
       continue;
     }
 
-    if (plugin_name == "Shockwave Flash") {
-      AddArg("--ppapi-flash-path=" + file_name);
-      AddArg("--ppapi-flash-version=" + version);
-      std::vector<std::string> flash_args;
-      if (UseFlagIsSet("disable_flash_hw_video_decode")) {
-        flash_args.push_back("enable_hw_video_decode=0");
-        flash_args.push_back("enable_hw_video_decode_ave=0");
-      }
-      if (!flash_args.empty())
-        AddArg("--ppapi-flash-args=" + base::JoinString(flash_args, ","));
-    } else {
-      const std::string description = LookUpInStringPairs(pairs, "DESCRIPTION");
-      const std::string mime_types = LookUpInStringPairs(pairs, "MIME_TYPES");
+    const std::string description = LookUpInStringPairs(pairs, "DESCRIPTION");
+    const std::string mime_types = LookUpInStringPairs(pairs, "MIME_TYPES");
 
-      std::string plugin_string = file_name;
-      if (!plugin_name.empty()) {
-        plugin_string += "#" + plugin_name;
-        if (!description.empty()) {
-          plugin_string += "#" + description;
-          if (!version.empty()) {
-            plugin_string += "#" + version;
-          }
+    std::string plugin_string = file_name;
+    if (!plugin_name.empty()) {
+      plugin_string += "#" + plugin_name;
+      if (!description.empty()) {
+        plugin_string += "#" + description;
+        if (!version.empty()) {
+          plugin_string += "#" + version;
         }
       }
-      plugin_string += ";" + mime_types;
-      register_plugins.push_back(plugin_string);
     }
+    plugin_string += ";" + mime_types;
+    register_plugins.push_back(plugin_string);
   }
 
   if (!register_plugins.empty()) {

libchromeos-ui/chromeos/ui/chromium_command_builder_test.cc

diff --git a/libchromeos-ui/chromeos/ui/chromium_command_builder_test.cc b/libchromeos-ui/chromeos/ui/chromium_command_builder_test.cc
index 13b530f..7c00629 100644
--- a/libchromeos-ui/chromeos/ui/chromium_command_builder_test.cc
+++ b/libchromeos-ui/chromeos/ui/chromium_command_builder_test.cc
@@ -167,7 +167,6 @@
   EXPECT_EQ("chronos", ReadEnvVar("LOGNAME"));
   EXPECT_EQ("/bin/sh", ReadEnvVar("SHELL"));
   EXPECT_FALSE(ReadEnvVar("PATH").empty());
-  EXPECT_EQ("en_US.utf8", ReadEnvVar("LC_ALL"));
   base::FilePath data_dir(util::GetReparentedPath("/home/chronos", base_path_));
   EXPECT_EQ(data_dir.value(), ReadEnvVar("DATA_DIR"));
   EXPECT_TRUE(base::DirectoryExists(data_dir));
@@ -373,14 +372,6 @@
 }
 
 TEST_F(ChromiumCommandBuilderTest, PepperPlugins) {
-  const char kFlash[] =
-      "# Here's a comment.\n"
-      "FILE_NAME=/opt/google/chrome/pepper/flash.so\n"
-      "PLUGIN_NAME=\"Shockwave Flash\"\n"
-      "VERSION=1.2.3.4\n";
-  ASSERT_EQ(strlen(kFlash), base::WriteFile(pepper_dir_.Append("flash.info"),
-                                            kFlash, strlen(kFlash)));
-
   const char kNetflix[] =
       "FILE_NAME=/opt/google/chrome/pepper/netflix.so\n"
       "PLUGIN_NAME=\"Netflix\"\n"
@@ -407,11 +398,6 @@
   ASSERT_TRUE(Init());
   ASSERT_TRUE(builder_.SetUpChromium());
 
-  EXPECT_EQ("--ppapi-flash-path=/opt/google/chrome/pepper/flash.so",
-            GetFirstArgWithPrefix("--ppapi-flash-path"));
-  EXPECT_EQ("--ppapi-flash-version=1.2.3.4",
-            GetFirstArgWithPrefix("--ppapi-flash-version"));
-
   // Plugins are ordered alphabetically by registration info.
   const char kExpected[] =
       "--register-pepper-plugins="