Deprecate NonThreadSafe in net/ in favor of SequenceChecker/ThreadChecker.

net/base/network_delegate.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 NET_BASE_NETWORK_DELEGATE_H_
 #define NET_BASE_NETWORK_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
-#include "base/threading/non_thread_safe.h"
+#include "base/threading/thread_checker.h"
 #include "net/base/auth.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_export.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/proxy/proxy_retry_info.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
@@ skipping 14 matching lines @@
 //
 // NOTE: It is not okay to add any compile-time dependencies on symbols outside
 // of net/base here, because we have a net_base library. Forward declarations
 // are ok.
 class CookieOptions;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyInfo;
 class URLRequest;
 
-class NET_EXPORT NetworkDelegate : public base::NonThreadSafe {
+class NET_EXPORT NetworkDelegate {
  public:
   // AuthRequiredResponse indicates how a NetworkDelegate handles an
   // OnAuthRequired call. It's placed in this file to prevent url_request.h
   // from having to include network_delegate.h.
   enum AuthRequiredResponse {
     AUTH_REQUIRED_RESPONSE_NO_ACTION,
     AUTH_REQUIRED_RESPONSE_SET_AUTH,
     AUTH_REQUIRED_RESPONSE_CANCEL_AUTH,
     AUTH_REQUIRED_RESPONSE_IO_PENDING,
   };
   typedef base::Callback<void(AuthRequiredResponse)> AuthCallback;
 
-  virtual ~NetworkDelegate() {}
+  virtual ~NetworkDelegate();
 
   // Notification interface called by the network stack. Note that these
   // functions mostly forward to the private virtuals. They also add some sanity
   // checking on parameters. See the corresponding virtuals for explanations of
   // the methods and their arguments.
   int NotifyBeforeURLRequest(URLRequest* request,
                              const CompletionCallback& callback,
                              GURL* new_url);
   int NotifyBeforeStartTransaction(URLRequest* request,
                                    const CompletionCallback& callback,
@@ skipping 44 matching lines @@
       const GURL& target_url,
       const GURL& referrer_url) const;
 
   bool CanQueueReportingReport(const url::Origin& origin) const;
   bool CanSendReportingReport(const url::Origin& origin) const;
   bool CanSetReportingClient(const url::Origin& origin,
                              const GURL& endpoint) const;
   bool CanUseReportingClient(const url::Origin& origin,
                              const GURL& endpoint) const;
 
+ protected:
+  THREAD_CHECKER(thread_checker_);
+
  private:
   // This is the interface for subclasses of NetworkDelegate to implement. These
   // member functions will be called by the respective public notification
   // member function, which will perform basic sanity checking.
   //
   // (NetworkDelegateImpl has default implementations of these member functions.
   // NetworkDelegate implementations should consider subclassing
   // NetworkDelegateImpl.)
 
   // Called before a request is sent. Allows the delegate to rewrite the URL
@@ skipping 178 matching lines @@
   virtual bool OnCanSetReportingClient(const url::Origin& origin,
                                        const GURL& endpoint) const = 0;
 
   virtual bool OnCanUseReportingClient(const url::Origin& origin,
                                        const GURL& endpoint) const = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_DELEGATE_H_