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

chrome/browser/safe_browsing/threat_details.cc

Index: chrome/browser/safe_browsing/threat_details.cc
diff --git a/chrome/browser/safe_browsing/threat_details.cc b/chrome/browser/safe_browsing/threat_details.cc
index 50d956d93ebb5392b07ea616c6d2b29c56ae7b2d..78df17f00870b79a167f41c40c67e423f2c1683c 100644
--- a/chrome/browser/safe_browsing/threat_details.cc
+++ b/chrome/browser/safe_browsing/threat_details.cc
@@ -23,7 +23,10 @@
 using content::BrowserThread;
 using content::NavigationEntry;
 using content::WebContents;
-using safe_browsing::ClientMalwareReportRequest;
+
+namespace safe_browsing {
+
+class ClientMalwareReportRequest;

[Nathan Parker, 2015/11/05 22:00:53]

Should be able to remove this, since it must have a concrete definition from one
of the header files already.

[vakh (old account. dont use), 2015/11/07 01:22:57]

Done.

 
 // Keep in sync with KMaxNodes in renderer/safe_browsing/malware_dom_details
 static const uint32 kMaxDomNodes = 500;
@@ -104,7 +107,7 @@ bool ThreatDetails::IsReportableUrl(const GURL& url) const {
 //
 ClientMalwareReportRequest::Resource* ThreatDetails::FindOrCreateResource(
     const GURL& url) {
-  safe_browsing::ResourceMap::iterator it = resources_.find(url.spec());
+  ResourceMap::iterator it = resources_.find(url.spec());
   if (it != resources_.end())
     return it->second.get();
 
@@ -250,7 +253,7 @@ void ThreatDetails::FinishCollection(bool did_proceed, int num_visit) {
   did_proceed_ = did_proceed;
   num_visits_ = num_visit;
   std::vector<GURL> urls;
-  for (safe_browsing::ResourceMap::const_iterator it = resources_.begin();
+  for (ResourceMap::const_iterator it = resources_.begin();
        it != resources_.end(); ++it) {
     urls.push_back(GURL(it->first));
   }
@@ -260,7 +263,7 @@ void ThreatDetails::FinishCollection(bool did_proceed, int num_visit) {
 
 void ThreatDetails::OnRedirectionCollectionReady() {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  const std::vector<safe_browsing::RedirectChain>& redirects =
+  const std::vector<RedirectChain>& redirects =
       redirects_collector_->GetCollectedUrls();
 
   for (size_t i = 0; i < redirects.size(); ++i)
@@ -282,7 +285,7 @@ void ThreatDetails::AddRedirectUrlList(const std::vector<GURL>& urls) {
 void ThreatDetails::OnCacheCollectionReady() {
   DVLOG(1) << "OnCacheCollectionReady.";
   // Add all the urls in our |resources_| maps to the |report_| protocol buffer.
-  for (safe_browsing::ResourceMap::const_iterator it = resources_.begin();
+  for (ResourceMap::const_iterator it = resources_.begin();
        it != resources_.end(); ++it) {
     ClientMalwareReportRequest::Resource* pb_resource =
         report_->add_resources();
@@ -313,3 +316,5 @@ void ThreatDetails::OnCacheCollectionReady() {
 
   ui_manager_->SendSerializedThreatDetails(serialized);
 }
+
+}  // namespace safe_browsing