cros: Fix "Add person" long delay regression

chrome/common/chrome_content_client.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_content_client.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
@@ skipping 537 matching lines @@
       new content::PepperPluginInfo);
   if (GetSystemPepperFlash(system_flash.get()))
     flash_versions.push_back(system_flash.release());
 
   // This function will return only the most recent version of the flash plugin.
   content::PepperPluginInfo* max_flash =
       FindMostRecentPlugin(flash_versions.get());
   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));
 #endif  // defined(GOOGLE_CHROME_BUILD) && defined(FLAPPER_AVAILABLE)
   }
 #endif  // defined(ENABLE_PLUGINS)
 }
 
 void ChromeContentClient::AddContentDecryptionModules(
     std::vector<content::CdmInfo>* cdms) {
@@ skipping 156 matching lines @@
     origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy());
   }
   return origin_trial_policy_.get();
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID