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

chrome/browser/safe_browsing/threat_details_cache.cc

 // 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.
 //
 // Implementation of the ThreatDetails class.
 
 #include "chrome/browser/safe_browsing/threat_details.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/md5.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/safe_browsing/report.pb.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/threat_details_cache.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using content::BrowserThread;
-using safe_browsing::ClientMalwareReportRequest;
+
+namespace safe_browsing {
+
+class ClientMalwareReportRequest;

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

Shouldn't need this pre-decl, since it must be in a header anyway.

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

Done.

 
 // Only send small files for now, a better strategy would use the size
 // of the whole report and the user's bandwidth.
 static const uint32 kMaxBodySizeBytes = 1024;
 
 ThreatDetailsCacheCollector::ThreatDetailsCacheCollector()
     : resources_(NULL), result_(NULL), has_started_(false) {}
 
 void ThreatDetailsCacheCollector::StartCacheCollection(
     net::URLRequestContextGetter* request_context_getter,
-    safe_browsing::ResourceMap* resources,
+    ResourceMap* resources,
     bool* result,
     const base::Closure& callback) {
   // Start the data collection from the HTTP cache. We use a URLFetcher
   // and set the right flags so we only hit the cache.
   DVLOG(1) << "Getting cache data for all urls...";
   request_context_getter_ = request_context_getter;
   resources_ = resources;
   resources_it_ = resources_->begin();
   result_ = result;
   callback_ = callback;
@@ skipping 34 matching lines @@
   current_fetch_->SetRequestContext(request_context_getter_.get());
   // Only from cache, and don't save cookies.
   current_fetch_->SetLoadFlags(net::LOAD_ONLY_FROM_CACHE |
                                net::LOAD_DO_NOT_SAVE_COOKIES);
   current_fetch_->SetAutomaticallyRetryOn5xx(false);  // No retries.
   current_fetch_->Start();  // OnURLFetchComplete will be called when done.
 }
 
 ClientMalwareReportRequest::Resource* ThreatDetailsCacheCollector::GetResource(
     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();
   }
   return NULL;
 }
 
 void ThreatDetailsCacheCollector::OnURLFetchComplete(
     const net::URLFetcher* source) {
   DVLOG(1) << "OnUrlFetchComplete";
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 91 matching lines @@
       base::Bind(&ThreatDetailsCacheCollector::OpenEntry, this));
 }
 
 void ThreatDetailsCacheCollector::AllDone(bool success) {
   DVLOG(1) << "AllDone";
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   *result_ = success;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, callback_);
   callback_.Reset();
 }
+
+}  // namespace safe_browsing