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

chrome/browser/component_updater/pepper_flash_component_installer.cc

Index: chrome/browser/component_updater/pepper_flash_component_installer.cc
diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index dffeaed950a09d57d2dc6cc73ac83de6a93d8149..e2fe85c6c83fde20bcec09536325e025e2ddf827 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -26,7 +26,6 @@
 #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"
@@ -38,6 +37,10 @@
 #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;
 
@@ -228,8 +231,12 @@ bool PepperFlashComponentInstaller::Install(
   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;