Require explicit selection of traits for LazyInstance

components/policy/core/common/policy_loader_win.cc

 // Copyright (c) 2014 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 "components/policy/core/common/policy_loader_win.h"
 
 #include <windows.h>
 #include <ntdsapi.h>  // For Ds[Un]Bind
 #include <rpc.h>      // For struct GUID
 #include <shlwapi.h>  // For PathIsUNC()
@@ skipping 195 matching lines @@
   base::ScopedNativeLibrary kernel32_lib_;
 
   IsWow64Process is_wow_64_process_;
   Wow64DisableWow64FSRedirection wow_64_disable_wow_64_fs_redirection_;
   Wow64RevertWow64FSRedirection wow_64_revert_wow_64_fs_redirection_;
 
   DISALLOW_COPY_AND_ASSIGN(Wow64Functions);
 };
 
 // Global Wow64Function instance used by ScopedDisableWow64Redirection below.
-static base::LazyInstance<Wow64Functions> g_wow_64_functions =
+static base::LazyInstance<Wow64Functions>::DestructorAtExit g_wow_64_functions =
     LAZY_INSTANCE_INITIALIZER;
 
 // Scoper that switches off Wow64 File System Redirection during its lifetime.
 class ScopedDisableWow64Redirection {
  public:
   ScopedDisableWow64Redirection()
     : active_(false),
       previous_state_(NULL) {
     Wow64Functions* wow64 = g_wow_64_functions.Pointer();
     if (wow64->is_valid() && wow64->IsWow64()) {
@@ skipping 32 matching lines @@
     return ::GetAppliedGPOList(flags, machine_name, sid_user, extension_guid,
                                gpo_list);
   }
 
   BOOL FreeGPOList(PGROUP_POLICY_OBJECT gpo_list) override {
     return ::FreeGPOList(gpo_list);
   }
 };
 
 // The default windows GPO list provider used for PolicyLoaderWin.
-static base::LazyInstance<WinGPOListProvider> g_win_gpo_list_provider =
-    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<WinGPOListProvider>::DestructorAtExit
+    g_win_gpo_list_provider = LAZY_INSTANCE_INITIALIZER;
 
 // Parses |gpo_dict| according to |schema| and writes the resulting policy
 // settings to |policy| for the given |scope| and |level|.
 void ParsePolicy(const RegistryDict* gpo_dict,
                  PolicyLevel level,
                  PolicyScope scope,
                  const Schema& schema,
                  PolicyMap* policy) {
   if (!gpo_dict)
     return;
@@ skipping 339 matching lines @@
 
 void PolicyLoaderWin::OnObjectSignaled(HANDLE object) {
   DCHECK(object == user_policy_changed_event_.handle() ||
          object == machine_policy_changed_event_.handle())
       << "unexpected object signaled policy reload, obj = "
       << std::showbase << std::hex << object;
   Reload(false);
 }
 
 }  // namespace policy