Componentize component_updater: Move some paths/constants to component.

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/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 334 matching lines @@
         cur = cur.DirName();
         cur = cur.DirName();
         cur = cur.DirName();
       }
 #else
       if (!GetInternalPluginsDirectory(&cur))
         return false;
 #endif
       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
       break;
-    case chrome::DIR_RECOVERY_BASE:
-      if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
-        return false;
-      cur = cur.Append(FILE_PATH_LITERAL("recovery"));
-      create_dir = true;
-      break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     case chrome::FILE_O1D_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kO1DPluginFileName);
       break;
     case chrome::FILE_GTALK_PLUGIN:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(kGTalkPluginFileName);
       break;
 #endif
-    case chrome::DIR_COMPONENT_CLD2:
-      if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
-        return false;
-      cur = cur.Append(FILE_PATH_LITERAL("CLD"));
-      break;
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 #if defined(WIDEVINE_CDM_IS_COMPONENT)
     case chrome::DIR_COMPONENT_WIDEVINE_CDM:
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(kWidevineCdmBaseDirectory);
       break;
 #endif  // defined(WIDEVINE_CDM_IS_COMPONENT)
     // TODO(xhwang): FILE_WIDEVINE_CDM_ADAPTER has different meanings.
     // In the component case, this is the source adapter. Otherwise, it is the
     // actual Pepper module that gets loaded.
     case chrome::FILE_WIDEVINE_CDM_ADAPTER:

[tommycli, 2014/06/27 17:48:11]

This widevine path also belongs in components/, but this path is hard to move,
as it depends on the GetInternalPlugins directory.

One way we could do this is add a second argument to the PathProvider
registration, and pass in a the path, retrieved via
chrome::DIR_INTERNAL_COMPONENTS, in the same way we are going to pass in
chrome::DIR_USER_DATA.

[Sorin Jianu, 2014/06/30 22:27:53]

Tommy, I don't understand what this means. Two ideas though: for changes to CDM
we need to consult with xhwang@. Second, maybe we do this change in a separate
CL where I could see the code.

[tommycli, 2014/07/01 00:03:04]

Sounds good. Let's do it in a separate CL.

       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
       break;
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX) && !defined(OS_IOS)
       if (base::mac::AmIBundled()) {
         cur = base::mac::FrameworkBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
@@ skipping 207 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