Allow DCI to pick up contents from Internet Plug-Ins on OS X.

components/component_updater/component_updater_paths.cc

 // Copyright 2014 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 "components/component_updater/component_updater_paths.h"
 
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 
 namespace component_updater {
 
 namespace {
 
 // This key gives the root directory of all the component installations.
 static int g_components_preinstalled_root_key = -1;
+static int g_components_preinstalled_root_key_alt = -1;
 static int g_components_user_root_key = -1;
 
 }  // namespace
 
 const base::FilePath::CharType kSupervisedUserWhitelistDirName[] =
     FILE_PATH_LITERAL("SupervisedUserWhitelists");
 
 bool PathProvider(int key, base::FilePath* result) {
   DCHECK_GT(g_components_user_root_key, 0);
   DCHECK_GT(g_components_preinstalled_root_key, 0);
 
   // Early exit here to prevent a potential infinite loop when we retrieve
   // the path for g_components_*_root_key.
   if (key < PATH_START || key > PATH_END)
     return false;
 
   switch (key) {
     case DIR_COMPONENT_PREINSTALLED:
       return PathService::Get(g_components_preinstalled_root_key, result);
+    case DIR_COMPONENT_PREINSTALLED_ALT:
+      return PathService::Get(g_components_preinstalled_root_key_alt, result);
     case DIR_COMPONENT_USER:
       return PathService::Get(g_components_user_root_key, result);
   }
 
   base::FilePath cur;
   if (!PathService::Get(g_components_user_root_key, &cur))
     return false;
 
   switch (key) {
     case DIR_COMPONENT_CLD2:
@@ skipping 12 matching lines @@
       return false;
   }
 
   *result = cur;
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider(int components_preinstalled_root_key,
+                          int components_preinstalled_root_key_alt,
                           int components_user_root_key) {
   DCHECK_EQ(g_components_preinstalled_root_key, -1);
+  DCHECK_EQ(g_components_preinstalled_root_key_alt, -1);
   DCHECK_EQ(g_components_user_root_key, -1);
   DCHECK_GT(components_preinstalled_root_key, 0);
+  DCHECK_GT(components_preinstalled_root_key_alt, 0);
   DCHECK_GT(components_user_root_key, 0);
   DCHECK(components_preinstalled_root_key < PATH_START ||
          components_preinstalled_root_key > PATH_END);
+  DCHECK(components_preinstalled_root_key_alt < PATH_START ||
+         components_preinstalled_root_key_alt > PATH_END);
   DCHECK(components_user_root_key < PATH_START ||
          components_user_root_key > PATH_END);
 
   g_components_preinstalled_root_key = components_preinstalled_root_key;
+  g_components_preinstalled_root_key_alt = components_preinstalled_root_key_alt;
   g_components_user_root_key = components_user_root_key;
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace component_updater