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"
@@ skipping 28 matching lines @@
   // over the lifetime of the app, so this method should be used with caution.
   static bool Override(int key, const FilePath& path);
 
   // This function does the same as PathService::Override but it takes an extra
   // parameter |create| which guides whether the directory to be overriden must
   // be created in case it doesn't exist already.
   static bool OverrideAndCreateIfNeeded(int key,
                                         const FilePath& path,
                                         bool create);
 
+  // Removes an override for a special directory or file. Returns true if there
+  // was an override to remove or false if none was present.
+  static bool RemoveOverride(int key);
+
   // To extend the set of supported keys, you can register a path provider,
   // which is just a function mirroring PathService::Get.  The ProviderFunc
   // returns false if it cannot provide a non-empty path for the given key.
   // Otherwise, true is returned.
   //
   // 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);
 };
 
 #endif  // BASE_PATH_SERVICE_H_