Revert "Options2: Pull the trigger."

base/path_service.cc

 // Copyright (c) 2011 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 "base/path_service.h"
 
 #ifdef OS_WIN
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 144 matching lines @@
     return true;
   }
   return false;
 }
 
 // static
 bool PathService::GetFromOverrides(int key, FilePath* result) {
   PathData* path_data = GetPathData();
   base::AutoLock scoped_lock(path_data->lock);
 
-  // check for an overridden version.
+  // check for an overriden version.
   PathMap::const_iterator it = path_data->overrides.find(key);
   if (it != path_data->overrides.end()) {
     *result = it->second;
     return true;
   }
   return false;
 }
 
 // static
 void PathService::AddToCache(int key, const FilePath& path) {
@@ skipping 47 matching lines @@
 
 bool PathService::Override(int key, const FilePath& path) {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
   DCHECK_GT(key, base::DIR_CURRENT) << "invalid path key";
 
   FilePath file_path = path;
 
   // Make sure the directory exists. We need to do this before we translate
   // this to the absolute path because on POSIX, AbsolutePath fails if called
-  // on a non-existent path.
+  // on a non-existant path.
   if (!file_util::PathExists(file_path) &&
       !file_util::CreateDirectory(file_path))
     return false;
 
   // We need to have an absolute path, as extensions and plugins don't like
-  // relative paths, and will gladly crash the browser in CHECK()s if they get a
+  // relative paths, and will glady crash the browser in CHECK()s if they get a
   // relative path.
   if (!file_util::AbsolutePath(&file_path))
     return false;
 
   base::AutoLock scoped_lock(path_data->lock);
 
   // Clear the cache now. Some of its entries could have depended
   // on the value we are overriding, and are now out of sync with reality.
   path_data->cache.clear();
 
@@ skipping 25 matching lines @@
   p = new Provider;
   p->is_static = false;
   p->func = func;
   p->next = path_data->providers;
 #ifndef NDEBUG
   p->key_start = key_start;
   p->key_end = key_end;
 #endif
   path_data->providers = p;
 }