Require explicit selection of traits for LazyInstance

android_webview/native/cookie_manager.cc

 // Copyright (c) 2011 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 "android_webview/native/cookie_manager.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 163 matching lines @@
   void RemoveAllCookies(std::unique_ptr<BoolCookieCallbackHolder> callback);
   void RemoveAllCookiesSync();
   void RemoveSessionCookiesSync();
   void RemoveExpiredCookies();
   void FlushCookieStore();
   bool HasCookies();
   bool AllowFileSchemeCookies();
   void SetAcceptFileSchemeCookies(bool accept);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<CookieManager>;
+  friend struct base::LazyInstanceTraitsBase<CookieManager>;
 
   CookieManager();
   ~CookieManager();
 
   void ExecCookieTaskSync(const base::Callback<void(BoolCallback)>& task);
   void ExecCookieTaskSync(const base::Callback<void(IntCallback)>& task);
   void ExecCookieTaskSync(const base::Callback<void(base::Closure)>& task);
   void ExecCookieTask(const base::Closure& task);
 
   void SetCookieHelper(const GURL& host,
@@ skipping 423 matching lines @@
 
 net::CookieStore* GetCookieStore() {
   return CookieManager::GetInstance()->GetCookieStore();
 }
 
 bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace