Implement support in DefaultComponentInstaller for picking up bundled

chrome/common/chrome_paths.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_paths.h"
 
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 67 matching lines @@
     *result = result->Append("Internet Plug-Ins");
     return true;
   }
   // In tests, just look in the module directory (below).
 #endif
 
   // The rest of the world expects plugins in the module directory.
   return PathService::Get(base::DIR_MODULE, result);
 }
 
+// Gets the path for internal plugins.

[Nico, 2016/05/16 21:09:52]

this comment could point that out then

[waffles, 2016/05/16 21:32:34]

Done.

+bool GetComponentDirectory(base::FilePath* result) {
+#if defined(OS_MACOSX)
+  // If called from Chrome, return the framework's Libraries directory.
+  if (base::mac::AmIBundled()) {
+    *result = chrome::GetFrameworkBundlePath();
+    DCHECK(!result->empty());
+    *result = result->Append("Libraries");
+    return true;
+  }
+// In tests, just look in the module directory (below).
+#endif
+
+  // The rest of the world expects components in the module directory.
+  return PathService::Get(base::DIR_MODULE, result);
+}
+
 #if defined(OS_WIN)
 // Gets the Pepper Flash path if installed on the system.
 bool GetSystemFlashFilename(base::FilePath* out_path) {
   const wchar_t kPepperFlashRegistryRoot[] =
       L"SOFTWARE\\Macromedia\\FlashPlayerPepper";
   const wchar_t kFlashPlayerPathValueName[] = L"PlayerPath";
 
   base::win::RegKey path_key(HKEY_LOCAL_MACHINE, kPepperFlashRegistryRoot,
                              KEY_READ);
   base::string16 path_str;
@@ skipping 151 matching lines @@
       if (!PathService::Get(base::DIR_EXE, &cur))
         return false;
 #endif
       cur = cur.Append(FILE_PATH_LITERAL("Dictionaries"));
       create_dir = true;
       break;
     case chrome::DIR_INTERNAL_PLUGINS:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       break;
+    case chrome::DIR_COMPONENTS:
+      if (!GetComponentDirectory(&cur))
+        return false;
+      break;
     case chrome::DIR_PEPPER_FLASH_PLUGIN:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.Append(kPepperFlashBaseDirectory);
       break;
     case chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN:
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(kPepperFlashBaseDirectory);
       break;
@@ skipping 297 matching lines @@
 
 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
   g_invalid_specified_user_data_dir.Get() = user_data_dir;
 }
 
 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
   return g_invalid_specified_user_data_dir.Get();
 }
 
 }  // namespace chrome