Remove some LazyInstance use in base/

base/path_service.cc

 // 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.
 
 #include "base/path_service.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #endif
 
 #include "base/containers/hash_tables.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 
 namespace base {
 
 bool PathProvider(int key, FilePath* result);
 
 #if defined(OS_WIN)
 bool PathProviderWin(int key, FilePath* result);
@@ skipping 95 matching lines @@
 #elif defined(OS_MACOSX)
     providers = &base_provider_mac;
 #elif defined(OS_ANDROID)
     providers = &base_provider_android;
 #elif defined(OS_POSIX)
     providers = &base_provider_posix;
 #endif
   }
 };
 
-static LazyInstance<PathData>::Leaky g_path_data = LAZY_INSTANCE_INITIALIZER;
-
 static PathData* GetPathData() {
-  return g_path_data.Pointer();
+  static auto path_data = new PathData();
+  return path_data;
 }
 
 // Tries to find |key| in the cache. |path_data| should be locked by the caller!
 bool LockedGetFromCache(int key, const PathData* path_data, FilePath* result) {
   if (path_data->cache_disabled)
     return false;
   // check for a cached version
   PathMap::const_iterator it = path_data->cache.find(key);
   if (it != path_data->cache.end()) {
     *result = it->second;
@@ skipping 176 matching lines @@
 void PathService::DisableCache() {
   PathData* path_data = GetPathData();
   DCHECK(path_data);
 
   AutoLock scoped_lock(path_data->lock);
   path_data->cache.clear();
   path_data->cache_disabled = true;
 }
 
 }  // namespace base