Require explicit selection of traits for LazyInstance

chrome/browser/media/router/media_router_factory.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 "chrome/browser/media/router/media_router_factory.h"
 
 #include "build/build_config.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/media/android/router/media_router_android.h"
 #else
 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_manager_factory.h"
 #endif
 
 using content::BrowserContext;
 
 namespace media_router {
 
 namespace {
 
-base::LazyInstance<MediaRouterFactory> service_factory =
+base::LazyInstance<MediaRouterFactory>::DestructorAtExit service_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
 MediaRouter* MediaRouterFactory::GetApiForBrowserContext(
     BrowserContext* context) {
   DCHECK(context);
   // GetServiceForBrowserContext returns a KeyedService hence the static_cast<>
   // to return a pointer to MediaRouter.
@@ skipping 42 matching lines @@
   media_router = new MediaRouterAndroid(context);
 #else
   media_router =
       new MediaRouterMojoImpl(extensions::ProcessManager::Get(context));
 #endif
   media_router->Initialize();
   return media_router;
 }
 
 }  // namespace media_router