Require explicit selection of traits for LazyInstance

chrome/browser/chromeos/app_mode/kiosk_app_manager.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 233 matching lines @@
                      const GURL& update_url,
                      const std::string& required_platform_version);
 
   AppSession* app_session() { return app_session_.get(); }
   bool external_loader_created() const { return external_loader_created_; }
   bool secondary_app_external_loader_created() const {
     return secondary_app_external_loader_created_;
   }
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<KioskAppManager>;
+  friend struct base::LazyInstanceTraitsBase<KioskAppManager>;
   friend std::default_delete<KioskAppManager>;
   friend class KioskAppManagerTest;
   friend class KioskTest;
   friend class KioskUpdateTest;
 
   enum AutoLoginState {
     AUTOLOGIN_NONE      = 0,
     AUTOLOGIN_REQUESTED = 1,
     AUTOLOGIN_APPROVED  = 2,
     AUTOLOGIN_REJECTED  = 3,
@@ skipping 90 matching lines @@
   base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_;
 
   std::unique_ptr<AppSession> app_session_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_