Require explicit selection of traits for LazyInstance

ui/keyboard/content/keyboard_content_util.cc

 // Copyright 2015 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 "ui/keyboard/content/keyboard_content_util.h"
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "ui/keyboard/grit/keyboard_resources.h"
 #include "ui/keyboard/grit/keyboard_resources_map.h"
 #include "url/gurl.h"
 
 namespace keyboard {
 namespace {
 
-base::LazyInstance<GURL> g_override_content_url = LAZY_INSTANCE_INITIALIZER;
+base::LazyInstance<GURL>::DestructorAtExit g_override_content_url =
+    LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 void SetOverrideContentUrl(const GURL& url) {
   g_override_content_url.Get() = url;
 }
 
 const GURL& GetOverrideContentUrl() {
   return g_override_content_url.Get();
 }
@@ skipping 73 matching lines @@
       {"keyboard/sounds/keypress-spacebar.wav",
        IDR_KEYBOARD_SOUNDS_KEYPRESS_SPACEBAR},
       {"keyboard/sounds/keypress-standard.wav",
        IDR_KEYBOARD_SOUNDS_KEYPRESS_STANDARD},
   };
   *size = arraysize(kKeyboardResources);
   return kKeyboardResources;
 }
 
 }  // namespace keyboard