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

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 5011cd1760be167f55a29c07463ed14ecbf0191a..9f525bd0f932d409bfd9d4345ac06f8a7e924935 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -65,7 +65,7 @@
 
 using content::BrowserThread;
 
-namespace {
+namespace safe_browsing {
 
 // Filename suffix for the cookie database.

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

anon-namespace

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

Done.

 const base::FilePath::CharType kCookiesFile[] = FILE_PATH_LITERAL(" Cookies");
@@ -94,8 +94,6 @@ base::FilePath CookieFilePath() {
       SafeBrowsingService::GetBaseFilename().value() + kCookiesFile);
 }
 
-}  // namespace
-
 class SafeBrowsingURLRequestContextGetter
     : public net::URLRequestContextGetter {
  public:
@@ -223,20 +221,20 @@ void SafeBrowsingService::Initialize() {
 #if defined(SAFE_BROWSING_CSD)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
-    csd_service_.reset(safe_browsing::ClientSideDetectionService::Create(
+    csd_service_.reset(ClientSideDetectionService::Create(
         url_request_context_getter_.get()));
   }
 #endif  // defined(SAFE_BROWSING_CSD)
 
-  download_service_.reset(new safe_browsing::DownloadProtectionService(
+  download_service_.reset(new DownloadProtectionService(
       this, url_request_context_getter_.get()));
 
   incident_service_.reset(CreateIncidentReportingService());
-  resource_request_detector_.reset(new safe_browsing::ResourceRequestDetector(
+  resource_request_detector_.reset(new ResourceRequestDetector(
       incident_service_->GetIncidentReceiver()));
 
   off_domain_inclusion_detector_.reset(
-      new safe_browsing::OffDomainInclusionDetector(database_manager_));
+      new OffDomainInclusionDetector(database_manager_));
 #endif  // !defined(FULL_SAFE_BROWSING)
 
   // Track the safe browsing preference of existing profiles.
@@ -354,7 +352,7 @@ SafeBrowsingService::CreatePreferenceValidationDelegate(
 
 #if defined(FULL_SAFE_BROWSING)
 void SafeBrowsingService::RegisterDelayedAnalysisCallback(
-    const safe_browsing::DelayedAnalysisCallback& callback) {
+    const DelayedAnalysisCallback& callback) {
   incident_service_->RegisterDelayedAnalysisCallback(callback);
 }
 #endif
@@ -390,18 +388,18 @@ SafeBrowsingDatabaseManager* SafeBrowsingService::CreateDatabaseManager() {
 }
 
 #if defined(FULL_SAFE_BROWSING)
-safe_browsing::IncidentReportingService*
+IncidentReportingService*
 SafeBrowsingService::CreateIncidentReportingService() {
-  return new safe_browsing::IncidentReportingService(
+  return new IncidentReportingService(
       this, url_request_context_getter_);
 }
 #endif
 
 void SafeBrowsingService::RegisterAllDelayedAnalysis() {
 #if defined(FULL_SAFE_BROWSING)
-  safe_browsing::RegisterBinaryIntegrityAnalysis();
-  safe_browsing::RegisterBlacklistLoadAnalysis();
-  safe_browsing::RegisterVariationsSeedSignatureAnalysis();
+  RegisterBinaryIntegrityAnalysis();
+  RegisterBlacklistLoadAnalysis();
+  RegisterVariationsSeedSignatureAnalysis();
 #else
   NOTREACHED();
 #endif
@@ -645,3 +643,5 @@ void SafeBrowsingService::RefreshState() {
     download_service_->SetEnabled(enable);
 #endif
 }
+
+}  // namespace safe_browsing