Add PathService::RemoveOverride to clear path overrides.

base/path_service.h

 // 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.
 
 #ifndef BASE_PATH_SERVICE_H_
 #define BASE_PATH_SERVICE_H_
 
 #include <string>
 
 #include "base/base_export.h"
 #include "base/base_paths.h"
+#include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 
 class FilePath;
 
 // The path service is a global table mapping keys to file system paths.  It is
 // OK to use this service from multiple threads.
 //
 class BASE_EXPORT PathService {
  public:
   // Retrieves a path to a special directory or file and places it into the
@@ skipping 32 matching lines @@
   // WARNING: This function could be called on any thread from which the
   // PathService is used, so a the ProviderFunc MUST BE THREADSAFE.
   //
   typedef bool (*ProviderFunc)(int, FilePath*);
 
   // Call to register a path provider.  You must specify the range "[key_start,
   // key_end)" of supported path keys.
   static void RegisterProvider(ProviderFunc provider,
                                int key_start,
                                int key_end);
+
  private:
-  static bool GetFromCache(int key, FilePath* path);
-  static bool GetFromOverrides(int key, FilePath* path);
-  static void AddToCache(int key, const FilePath& path);
+  FRIEND_TEST_ALL_PREFIXES(PathServiceTest, RemoveOverride);
+
+  // Removes an override for a special directory or file. Returns true if there
+  // was an override to remove or false if none was present.
+  // NOTE: This function is intended to be used by tests only!
+  static bool RemoveOverride(int key);
 };
 
 #endif  // BASE_PATH_SERVICE_H_