Make PathData's LazyInstance Leaky

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>
@@ skipping 108 matching lines @@
 #if defined(OS_WIN)
     providers = &base_provider_win;
 #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
   }
-
-  ~PathData() {
-    Provider* p = providers;
-    while (p) {
-      Provider* next = p->next;
-      if (!p->is_static)
-        delete p;
-      p = next;
-    }
-  }
 };
 
-static LazyInstance<PathData> g_path_data = LAZY_INSTANCE_INITIALIZER;
+static LazyInstance<PathData>::Leaky g_path_data = LAZY_INSTANCE_INITIALIZER;
 
 static PathData* GetPathData() {
   return g_path_data.Pointer();
 }
 
 // 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
@@ skipping 179 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