Require explicit selection of traits for LazyInstance

chrome/browser/android/background_sync_launcher_android.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_BACKGROUND_SYNC_LAUNCHER_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_BACKGROUND_SYNC_LAUNCHER_ANDROID_H_
 
 #include <stdint.h>
 
 #include <set>
@@ skipping 13 matching lines @@
   static void LaunchBrowserIfStopped(bool launch_when_next_online,
                                      int64_t min_delay_ms);
 
   static bool ShouldDisableBackgroundSync();
 
   // TODO(iclelland): Remove this once the bots have their play services package
   // updated before every test run. (https://crbug.com/514449)
   static void SetPlayServicesVersionCheckDisabledForTests(bool disabled);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<BackgroundSyncLauncherAndroid>;
+  friend struct base::LazyInstanceTraitsBase<BackgroundSyncLauncherAndroid>;
 
   // Constructor and destructor marked private to enforce singleton
   BackgroundSyncLauncherAndroid();
   ~BackgroundSyncLauncherAndroid();
 
   void LaunchBrowserIfStoppedImpl(bool launch_when_next_online,
                                   int64_t min_delay_ms);
 
   base::android::ScopedJavaGlobalRef<jobject> java_launcher_;
   DISALLOW_COPY_AND_ASSIGN(BackgroundSyncLauncherAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_BACKGROUND_SYNC_LAUNCHER_ANDROID_H_