Add missing accessor to ios PathProvider.

ios/chrome/browser/chrome_paths.mm

 // Copyright 2015 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 "ios/chrome/browser/chrome_paths.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread_restrictions.h"
+#include "components/gcm_driver/gcm_driver_constants.h"
+#include "ios/chrome/browser/chrome_paths_internal.h"
 
 namespace ios {
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
 const base::FilePath::CharType kProductDirName[] =
     FILE_PATH_LITERAL("Google/Chrome");
 #else
 const base::FilePath::CharType kProductDirName[] =
     FILE_PATH_LITERAL("Chromium");
@@ skipping 30 matching lines @@
 
     case DIR_TEST_DATA:
       if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("ios"));
       cur = cur.Append(FILE_PATH_LITERAL("chrome"));
       cur = cur.Append(FILE_PATH_LITERAL("test"));
       cur = cur.Append(FILE_PATH_LITERAL("data"));
       break;
 
+    case DIR_GLOBAL_GCM_STORE:
+      if (!PathService::Get(DIR_USER_DATA, &cur))
+        return false;
+      cur = cur.Append(gcm_driver::kGCMStoreDirname);
+      break;
+
     case FILE_LOCAL_STATE:
-      if (!PathService::Get(ios::DIR_USER_DATA, &cur))
+      if (!PathService::Get(DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("Local State"));
       break;
 
+    case FILE_RESOURCES_PACK:
+      if (!base::PathService::Get(DIR_USER_DATA, &cur))

[blundell, 2015/11/04 12:14:26]

This is base::DIR_MODULE in chrome_paths.cc. Any reason for the difference?

[sdefresne, 2015/11/04 13:27:42]

No reason, it is a mistake, thank you for catching it.

+        return false;
+      cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
+      break;
+
     default:
       return false;
   }
 
   if (create_dir && !base::PathExists(cur) && !base::CreateDirectory(cur))
     return false;
 
   *result = cur;
   return true;
 }
 
 }  // namespace
 
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
+void GetUserCacheDirectory(const base::FilePath& browser_state_dir,
+                           base::FilePath* result) {
+  // If the browser state directory is under ~/Library/Application Support,
+  // use a suitable cache directory under ~/Library/Caches.
+
+  // Default value in cases where any of the following fails.
+  *result = browser_state_dir;
+
+  base::FilePath app_data_dir;
+  if (!PathService::Get(base::DIR_APP_DATA, &app_data_dir))
+    return;
+  base::FilePath cache_dir;
+  if (!PathService::Get(base::DIR_CACHE, &cache_dir))
+    return;
+  if (!app_data_dir.AppendRelativePath(browser_state_dir, &cache_dir))
+    return;
+
+  *result = cache_dir;
+}
+
 }  // namespace ios