Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace.

chrome/browser/renderer_host/safe_browsing_resource_throttle.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 CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
 #define CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/resource_type.h"
 #include "net/log/net_log.h"
 
+using safe_browsing::SafeBrowsingDatabaseManager;

[Nathan Parker, 2015/11/11 21:23:36]

shouldn't use "using" in .h's.

[vakh (old account. dont use), 2015/11/11 23:22:46]

Done.

+using safe_browsing::SafeBrowsingUIManager;
+
 class ResourceDispatcherHost;
 
 namespace net {
 class URLRequest;
 }
 
 // SafeBrowsingResourceThrottle checks that URLs are "safe" before
 // navigating to them. To be considered "safe", a URL must not appear in the
 // malware/phishing blacklists (see SafeBrowsingService for details).
 //
@@ skipping 32 matching lines @@
 class SafeBrowsingResourceThrottle
     : public content::ResourceThrottle,
       public SafeBrowsingDatabaseManager::Client,
       public base::SupportsWeakPtr<SafeBrowsingResourceThrottle> {
  public:
   // Will construct a SafeBrowsingResourceThrottle, or return NULL
   // if on Android and not in the field trial.
   static SafeBrowsingResourceThrottle* MaybeCreate(
       net::URLRequest* request,
       content::ResourceType resource_type,
-      SafeBrowsingService* sb_service);
+      safe_browsing::SafeBrowsingService* sb_service);
 
   // content::ResourceThrottle implementation (called on IO thread):
   void WillStartRequest(bool* defer) override;
   void WillRedirectRequest(const net::RedirectInfo& redirect_info,
                            bool* defer) override;
   void WillProcessResponse(bool* defer) override;
 
   const char* GetNameForLogging() const override;
 
   // SafeBrowsingDabaseManager::Client implementation (called on IO thread):
   void OnCheckBrowseUrlResult(const GURL& url,
-                              SBThreatType result,
+                              safe_browsing::SBThreatType result,
                               const std::string& metadata) override;
 
  protected:
   SafeBrowsingResourceThrottle(const net::URLRequest* request,
                                content::ResourceType resource_type,
-                               SafeBrowsingService* sb_service);
+                               safe_browsing::SafeBrowsingService* sb_service);
 
  private:
   // Describes what phase of the check a throttle is in.
   enum State {
     // Haven't started checking or checking is complete. Not deferred.
     STATE_NONE,
     // We have one outstanding URL-check. Could be deferred.
     STATE_CHECKING_URL,
     // We're displaying a blocking page. Could be deferred.
     STATE_DISPLAYING_BLOCKING_PAGE,
@@ skipping 44 matching lines @@
                         const char* value);
   void EndNetLogEvent(net::NetLog::EventType type,
                       const char* name,
                       const char* value);
 
   State state_;
   DeferState defer_state_;
 
   // The result of the most recent safe browsing check. Only valid to read this
   // when state_ != STATE_CHECKING_URL.
-  SBThreatType threat_type_;
+  safe_browsing::SBThreatType threat_type_;
 
   // The time when we started deferring the request.
   base::TimeTicks defer_start_time_;
 
   // Timer to abort the safe browsing check if it takes too long.
   base::OneShotTimer timer_;
 
   // The redirect chain for this resource
   std::vector<GURL> redirect_urls_;
 
   // If in DEFERRED_UNCHECKED_REDIRECT state, this is the
   // URL we still need to check before resuming.
   GURL unchecked_redirect_url_;
   GURL url_being_checked_;
 
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
   const net::URLRequest* request_;
   const content::ResourceType resource_type_;
   net::BoundNetLog bound_net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingResourceThrottle);
 };
 #endif  // CHROME_BROWSER_RENDERER_HOST_SAFE_BROWSING_RESOURCE_THROTTLE_H_