Require explicit selection of traits for LazyInstance

android_webview/browser/aw_cookie_access_policy.h

 // Copyright (c) 2012 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 ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
@@ skipping 47 matching lines @@
                       int render_frame_id);
   bool AllowSetCookie(const GURL& url,
                       const GURL& first_party,
                       const std::string& cookie_line,
                       content::ResourceContext* context,
                       int render_process_id,
                       int render_frame_id,
                       const net::CookieOptions& options);
 
  private:
-  friend struct base::DefaultLazyInstanceTraits<AwCookieAccessPolicy>;
+  friend struct base::LazyInstanceTraitsBase<AwCookieAccessPolicy>;
 
   AwCookieAccessPolicy();
   ~AwCookieAccessPolicy();
   bool accept_cookies_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AwCookieAccessPolicy);
 };
 
 class AwStaticCookiePolicy {
@@ skipping 24 matching lines @@
   // If ShouldAcceptCookies and ShouldAcceptThirdPartyCookies
   //    then allow all cookies.
   net::StaticCookiePolicy::Type GetPolicy(const GURL& url) const;
 
   DISALLOW_COPY_AND_ASSIGN(AwStaticCookiePolicy);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_AW_COOKIE_ACCESS_POLICY_H_