Address some additional cleanup work needed for the component flash updates on Linux.

chrome/browser/component_updater/pepper_flash_component_installer.cc

 // Copyright (c) 2013 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 <stdint.h>
 #include <string.h>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/flash_component_installer.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/component_flash_hint_file_linux.h"
 #include "chrome/common/pepper_flash.h"
 #include "chrome/common/ppapi_utils.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/update_client/update_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.  NOLINT
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
+#if defined(OS_LINUX)
+#include "chrome/common/component_flash_hint_file_linux.h"
+#endif  // defined(OS_LINUX)
+
 using content::BrowserThread;
 using content::PluginService;
 
 namespace component_updater {
 
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
 const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
                              0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
                              0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
                              0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c};
 
 // If we don't have a Pepper Flash component, this is the version we claim.
 const char kNullVersion[] = "0.0.0.0";
 
-#endif  // defined(GOOGLE_CHROME_BUILD)
-
 // The base directory on Windows looks like:
 // <profile>\AppData\Local\Google\Chrome\User Data\PepperFlash\.
 base::FilePath GetPepperFlashBaseDirectory() {
   base::FilePath result;
   PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &result);
   return result;
 }
 
-#if defined(GOOGLE_CHROME_BUILD)
 // Pepper Flash plugins have the version encoded in the path itself
 // so we need to enumerate the directories to find the full path.
 // On success, |latest_dir| returns something like:
 // <profile>\AppData\Local\Google\Chrome\User Data\PepperFlash\10.3.44.555\.
 // |latest_version| returns the corresponding version number. |older_dirs|
 // returns directories of all older versions.
 bool GetPepperFlashDirectory(base::FilePath* latest_dir,
                              Version* latest_version,
                              std::vector<base::FilePath>* older_dirs) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   base::FilePath base_dir = GetPepperFlashBaseDirectory();

[Lei Zhang, 2015/08/17 23:34:58]

Don't we want to get the correct |base_dir| here? i.e.
GetPepperFlashBaseDirectory() doesn't check the PathService::Get() result, but
should. Once you do that in GetPepperFlashBaseDirectory(), it becomes a bit of a
useless wrapper...

[Greg K, 2015/08/18 18:01:16]

Done.

   bool found = false;
   base::FileEnumerator file_enumerator(
       base_dir, false, base::FileEnumerator::DIRECTORIES);
   for (base::FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
     Version version(path.BaseName().MaybeAsASCII());
     if (!version.IsValid())
       continue;
     if (found) {
       if (version.CompareTo(*latest_version) > 0) {
@@ skipping 131 matching lines @@
   Version version;
   if (!chrome::CheckPepperFlashManifest(manifest, &version))
     return false;
   if (current_version_.CompareTo(version) > 0)
     return false;
   const base::FilePath unpacked_plugin =
       unpack_path.Append(chrome::kPepperFlashPluginFilename);
   if (!base::PathExists(unpacked_plugin))
     return false;
   // Passed the basic tests. Time to install it.
-  base::FilePath path =
-      GetPepperFlashBaseDirectory().AppendASCII(version.GetString());
+  base::FilePath path;
+  if (!PathService::Get(chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN,
+                        &path)) {
+    return false;
+  }
+  path = path.AppendASCII(version.GetString());
   if (base::PathExists(path))
     return false;
   current_version_ = version;
 
   if (!base::Move(unpack_path, path))
     return false;
 #if defined(OS_LINUX)
   const base::FilePath flash_path =
       path.Append(chrome::kPepperFlashPluginFilename);
   // Populate the component updated flash hint file so that the zygote can
   // locate and preload the latest version of flash.
-  if (!chrome::component_flash_hint_file::RecordFlashUpdate(
-          flash_path, flash_path, version.GetString())) {
+  if (!component_flash_hint_file::RecordFlashUpdate(flash_path, flash_path,
+                                                    version.GetString())) {
     if (!base::DeleteFile(path, true))
       LOG(ERROR) << "Hint file creation failed, but unable to delete "
                     "installed flash plugin.";
     return false;
   }
 #else
   // Installation is done. Now tell the rest of chrome. Both the path service
   // and to the plugin service. On Linux, a restart is required to use the new
   // Flash version, so we do not do this.
   PathService::Override(chrome::DIR_PEPPER_FLASH_PLUGIN, path);
@@ skipping 88 matching lines @@
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (cmd_line->HasSwitch(switches::kDisableBundledPpapiFlash))
     return;
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&StartPepperFlashUpdateRegistration, cus));
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
 }  // namespace component_updater