Add a new ctor to ScopedPathOverride for tests that override files.

BUG=none
TBR=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/766813002

Cr-Commit-Position: refs/heads/master@{#306035}

2 files changed, 17 insertions, 0 deletions

diff --git a/base/test/scoped_path_override.cc b/base/test/scoped_path_override.cc
index 495ba2f..9a77611 100644
--- a/base/test/scoped_path_override.cc
+++ b/base/test/scoped_path_override.cc
@@ -22,6 +22,16 @@ ScopedPathOverride::ScopedPathOverride(int key, const base::FilePath& dir)
   CHECK(result);
 }
 
+ScopedPathOverride::ScopedPathOverride(int key,
+                                       const FilePath& path,
+                                       bool is_absolute,
+                                       bool create)
+    : key_(key) {
+  bool result =
+      PathService::OverrideAndCreateIfNeeded(key, path, is_absolute, create);
+  CHECK(result);
+}
+
 ScopedPathOverride::~ScopedPathOverride() {
    bool result = PathService::RemoveOverride(key_);
    CHECK(result) << "The override seems to have been removed already!";
diff --git a/base/test/scoped_path_override.h b/base/test/scoped_path_override.h
index a1e18e3..c6cffe2 100644
--- a/base/test/scoped_path_override.h
+++ b/base/test/scoped_path_override.h
@@ -20,8 +20,15 @@ class ScopedPathOverride {
  public:
   // Contructor that initializes the override to a scoped temp directory.
   explicit ScopedPathOverride(int key);
+
   // Constructor that would use a path provided by the user.
   ScopedPathOverride(int key, const FilePath& dir);
+
+  // See PathService::OverrideAndCreateIfNeeded.
+  ScopedPathOverride(int key,
+                     const FilePath& path,
+                     bool is_absolute,
+                     bool create);
   ~ScopedPathOverride();
 
  private: