Revert of Rearrange Flash component registration.

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 1fd657878c1a92af509092772fbde5ed99eefb19..57355af2b5fb25e83a2c12238619c9daf1de2928 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -338,10 +338,8 @@
 #endif  // defined(FLAPPER_AVAILABLE)
   return false;
 }
-
-// Similar to GetComponentUpdatedPepperFlash, this is used on Linux only because
-// on other platforms the component updater will take responsibility for
-// locating and registering the bundled version of Flash.
+#endif  // defined(OS_LINUX)
+
 bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
 #if defined(FLAPPER_AVAILABLE)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -367,7 +365,6 @@
   return false;
 #endif  // FLAPPER_AVAILABLE
 }
-#endif  // defined(OS_LINUX)
 
 bool GetSystemPepperFlash(content::PepperPluginInfo* plugin) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -534,12 +531,12 @@
       new content::PepperPluginInfo);
   if (GetComponentUpdatedPepperFlash(component_flash.get()))
     flash_versions.push_back(component_flash.release());
+#endif  // defined(OS_LINUX)
 
   std::unique_ptr<content::PepperPluginInfo> bundled_flash(
       new content::PepperPluginInfo);
   if (GetBundledPepperFlash(bundled_flash.get()))
     flash_versions.push_back(bundled_flash.release());
-#endif  // defined(OS_LINUX)
 
   std::unique_ptr<content::PepperPluginInfo> system_flash(
       new content::PepperPluginInfo);