[Extensions] Change GetIndexedRulesetPath to return relative path.

This allows ContentVerifier::ShouldVerifyAnyPaths to compare
relative paths against indexed ruleset's relative path in future. This
will obviate the need to construct full path (which can be tricky some
times). Note that this will be done in a follow up.

Bug: 796395
Test: No behavior changes expected.
Change-Id: I05febe27eb52c2c823e6e609f1be6d9803b471bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2071335Reviewed-by: Oleg Davydov <burunduk@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744287}

chrome/browser/extensions/api/declarative_net_request/rule_indexing_unittest.cc

@@ -157,8 +157,9 @@ class RuleIndexingTest : public DNRTestBase {
 
     if (persist_initial_indexed_ruleset_) {
       std::string data = "user ruleset";
-      base::WriteFile(file_util::GetIndexedRulesetPath(extension_dir_),
-                      data.c_str(), data.size());
+      base::WriteFile(
+          extension_dir_.Append(file_util::GetIndexedRulesetRelativePath()),
+          data.c_str(), data.size());
     }
   }
 

extensions/browser/api/declarative_net_request/ruleset_source.cc

@@ -232,9 +232,9 @@ const size_t RulesetSource::kDynamicRulesetID = 2;
 RulesetSource RulesetSource::CreateStatic(const Extension& extension) {
   return RulesetSource(
       declarative_net_request::DNRManifestData::GetRulesetPath(extension),
-      file_util::GetIndexedRulesetPath(extension.path()), kStaticRulesetID,
-      dnr_api::SOURCE_TYPE_MANIFEST, dnr_api::MAX_NUMBER_OF_RULES,
-      extension.id());
+      extension.path().Append(file_util::GetIndexedRulesetRelativePath()),
+      kStaticRulesetID, dnr_api::SOURCE_TYPE_MANIFEST,
+      dnr_api::MAX_NUMBER_OF_RULES, extension.id());
 }
 
 // static

extensions/browser/content_verifier.cc

@@ -716,8 +716,10 @@ bool ContentVerifier::ShouldVerifyAnyPaths(
     base::FilePath relative_path = relative_unix_path.NormalizePathSeparators();
     base::FilePath full_path = extension_root.Append(relative_path);
 
-    if (full_path == file_util::GetIndexedRulesetPath(extension_root))
+    if (full_path ==
+        extension_root.Append(file_util::GetIndexedRulesetRelativePath())) {
       continue;
+    }
 
     if (locales_relative_dir.IsParent(relative_path)) {
       if (!all_locales) {

extensions/common/file_util.cc

@@ -585,17 +585,15 @@ base::FilePath GetVerifiedContentsPath(const base::FilePath& extension_path) {
 base::FilePath GetComputedHashesPath(const base::FilePath& extension_path) {
   return extension_path.Append(kMetadataFolder).Append(kComputedHashesFilename);
 }
-base::FilePath GetIndexedRulesetPath(const base::FilePath& extension_path) {
-  return extension_path.Append(kMetadataFolder).Append(kIndexedRulesetFilename);
+base::FilePath GetIndexedRulesetRelativePath() {
+  return base::FilePath(kMetadataFolder).Append(kIndexedRulesetFilename);
 }
 
 std::vector<base::FilePath> GetReservedMetadataFilePaths(
     const base::FilePath& extension_path) {
-  return {
-      GetVerifiedContentsPath(extension_path),
-      GetComputedHashesPath(extension_path),
-      GetIndexedRulesetPath(extension_path),
-  };
+  return {GetVerifiedContentsPath(extension_path),
+          GetComputedHashesPath(extension_path),
+          extension_path.Append(GetIndexedRulesetRelativePath())};
 }
 
 }  // namespace file_util

extensions/common/file_util.h

@@ -172,7 +172,7 @@ base::FilePath GetComputedHashesPath(const base::FilePath& extension_path);
 
 // Helper function to get path used for the indexed ruleset by the Declarative
 // Net Request API.
-base::FilePath GetIndexedRulesetPath(const base::FilePath& extension_path);
+base::FilePath GetIndexedRulesetRelativePath();
 
 // Returns the list of file-paths reserved for use by the Extension system in
 // the kMetadataFolder.