cros: Fix "Add person" long delay regression

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 92a23fb892bf60837489d184c5dfb20e4f3104a8..61b584567c1fafc3d3422d8d97637e1dfb363d3f 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -555,12 +555,14 @@ void ChromeContentClient::AddPepperPlugins(
   if (max_flash) {
     plugins->push_back(*max_flash);
   } else {
-#if defined(GOOGLE_CHROME_BUILD) && defined(FLAPPER_AVAILABLE)
+#if defined(GOOGLE_CHROME_BUILD) && defined(FLAPPER_AVAILABLE) && \
+    !defined(OS_CHROMEOS)
     // Add a fake Flash plugin even though it doesn't actually exist - if a
     // web page requests it, it will be component-updated on-demand. There is
     // nothing that guarantees the component update will give us the
     // FLAPPER_VERSION_STRING version of Flash, but using this version seems
     // better than any other hardcoded alternative.
+    // Except for ChromeOS where Flash plugin is bundled.
     plugins->push_back(CreatePepperFlashInfo(
         base::FilePath::FromUTF8Unsafe(ChromeContentClient::kNotPresent),
         FLAPPER_VERSION_STRING, false, false, true));