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.cc

Index: chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
index 93ed8b75844f9cb89bfd8942c34af61f2db4324c..9217c949fd41a81b1454f8ab39da6e4d2f64aef3 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
@@ -71,7 +71,7 @@ scoped_ptr<base::Value> NetLogStringCallback(
 SafeBrowsingResourceThrottle* SafeBrowsingResourceThrottle::MaybeCreate(
     net::URLRequest* request,
     content::ResourceType resource_type,
-    SafeBrowsingService* sb_service) {
+    safe_browsing::SafeBrowsingService* sb_service) {
   if (sb_service->database_manager()->IsSupported()) {
     return new SafeBrowsingResourceThrottle(request, resource_type, sb_service);
   }
@@ -81,10 +81,10 @@ SafeBrowsingResourceThrottle* SafeBrowsingResourceThrottle::MaybeCreate(
 SafeBrowsingResourceThrottle::SafeBrowsingResourceThrottle(
     const net::URLRequest* request,
     content::ResourceType resource_type,
-    SafeBrowsingService* sb_service)
+    safe_browsing::SafeBrowsingService* sb_service)
     : state_(STATE_NONE),
       defer_state_(DEFERRED_NONE),
-      threat_type_(SB_THREAT_TYPE_SAFE),
+      threat_type_(safe_browsing::SB_THREAT_TYPE_SAFE),
       database_manager_(sb_service->database_manager()),
       ui_manager_(sb_service->ui_manager()),
       request_(request),
@@ -201,7 +201,7 @@ const char* SafeBrowsingResourceThrottle::GetNameForLogging() const {
 // the URL has been classified.
 void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
     const GURL& url,
-    SBThreatType threat_type,
+    safe_browsing::SBThreatType threat_type,
     const std::string& metadata) {
   CHECK_EQ(state_, STATE_CHECKING_URL);
   CHECK_EQ(url, url_being_checked_);
@@ -213,10 +213,11 @@ void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
   if (defer_state_ != DEFERRED_NONE) {
     EndNetLogEvent(NetLog::TYPE_SAFE_BROWSING_DEFERRED, nullptr, nullptr);
   }
-  EndNetLogEvent(NetLog::TYPE_SAFE_BROWSING_CHECKING_URL, "result",
-                 threat_type_ == SB_THREAT_TYPE_SAFE ? "safe" : "unsafe");
+  EndNetLogEvent(
+      NetLog::TYPE_SAFE_BROWSING_CHECKING_URL, "result",
+      threat_type_ == safe_browsing::SB_THREAT_TYPE_SAFE ? "safe" : "unsafe");
 
-  if (threat_type == SB_THREAT_TYPE_SAFE) {
+  if (threat_type == safe_browsing::SB_THREAT_TYPE_SAFE) {
     RecordHistogramResourceTypeSafe(resource_type_);
     if (defer_state_ != DEFERRED_NONE) {
       // Log how much time the safe browsing check cost us.
@@ -242,7 +243,7 @@ void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request_);
 
-  SafeBrowsingUIManager::UnsafeResource resource;
+  safe_browsing::SafeBrowsingUIManager::UnsafeResource resource;
   resource.url = url;
   resource.original_url = request_->original_url();
   resource.redirect_urls = redirect_urls_;
@@ -254,7 +255,7 @@ void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
       &SafeBrowsingResourceThrottle::OnBlockingPageComplete, AsWeakPtr());
   resource.render_process_host_id = info->GetChildID();
   resource.render_view_id = info->GetRouteID();
-  resource.threat_source = SafeBrowsingUIManager::FROM_DEVICE;
+  resource.threat_source = safe_browsing::SafeBrowsingUIManager::FROM_DEVICE;
 
   state_ = STATE_DISPLAYING_BLOCKING_PAGE;
 
@@ -267,8 +268,8 @@ void SafeBrowsingResourceThrottle::OnCheckBrowseUrlResult(
 
 void SafeBrowsingResourceThrottle::StartDisplayingBlockingPage(
     const base::WeakPtr<SafeBrowsingResourceThrottle>& throttle,
-    scoped_refptr<SafeBrowsingUIManager> ui_manager,
-    const SafeBrowsingUIManager::UnsafeResource& resource) {
+    scoped_refptr<safe_browsing::SafeBrowsingUIManager> ui_manager,
+    const safe_browsing::SafeBrowsingUIManager::UnsafeResource& resource) {
   content::RenderViewHost* rvh = content::RenderViewHost::FromID(
       resource.render_process_host_id, resource.render_view_id);
   if (rvh) {
@@ -304,7 +305,7 @@ void SafeBrowsingResourceThrottle::OnBlockingPageComplete(bool proceed) {
   state_ = STATE_NONE;
 
   if (proceed) {
-    threat_type_ = SB_THREAT_TYPE_SAFE;
+    threat_type_ = safe_browsing::SB_THREAT_TYPE_SAFE;
     if (defer_state_ != DEFERRED_NONE) {
       ResumeRequest();
     }
@@ -329,7 +330,7 @@ bool SafeBrowsingResourceThrottle::CheckUrl(const GURL& url) {
 
   if (succeeded_synchronously) {
     RecordHistogramResourceTypeSafe(resource_type_);
-    threat_type_ = SB_THREAT_TYPE_SAFE;
+    threat_type_ = safe_browsing::SB_THREAT_TYPE_SAFE;
     ui_manager_->LogPauseDelay(base::TimeDelta());  // No delay.
     return true;
   }
@@ -354,7 +355,7 @@ void SafeBrowsingResourceThrottle::OnCheckUrlTimeout() {
 
   database_manager_->CancelCheck(this);
   OnCheckBrowseUrlResult(
-      url_being_checked_, SB_THREAT_TYPE_SAFE, std::string());
+      url_being_checked_, safe_browsing::SB_THREAT_TYPE_SAFE, std::string());
 }
 
 void SafeBrowsingResourceThrottle::ResumeRequest() {