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

 // 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 47 matching lines @@
 #include "chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.h"
 #include "chrome/browser/safe_browsing/incident_reporting/blacklist_load_analyzer.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 #include "chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.h"
 #include "chrome/browser/safe_browsing/incident_reporting/resource_request_detector.h"
 #include "chrome/browser/safe_browsing/incident_reporting/variations_seed_signature_analyzer.h"
 #endif
 
 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");
 
 // The default URL prefix where browser fetches chunk updates, hashes,
 // and reports safe browsing hits and malware details.
 const char kSbDefaultURLPrefix[] =
     "https://safebrowsing.google.com/safebrowsing";
 
 // The backup URL prefix used when there are issues establishing a connection
 // with the server at the primary URL.
 const char kSbBackupConnectErrorURLPrefix[] =
     "https://alt1-safebrowsing.google.com/safebrowsing";
 
 // The backup URL prefix used when there are HTTP-specific issues with the
 // server at the primary URL.
 const char kSbBackupHttpErrorURLPrefix[] =
     "https://alt2-safebrowsing.google.com/safebrowsing";
 
 // The backup URL prefix used when there are local network specific issues.
 const char kSbBackupNetworkErrorURLPrefix[] =
     "https://alt3-safebrowsing.google.com/safebrowsing";
 
 base::FilePath CookieFilePath() {
   return base::FilePath(
       SafeBrowsingService::GetBaseFilename().value() + kCookiesFile);
 }
 
-}  // namespace
-
 class SafeBrowsingURLRequestContextGetter
     : public net::URLRequestContextGetter {
  public:
   explicit SafeBrowsingURLRequestContextGetter(
       SafeBrowsingService* sb_service_);
 
   // Implementation for net::UrlRequestContextGetter.
   net::URLRequestContext* GetURLRequestContext() override;
   scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
       const override;
@@ skipping 107 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &SafeBrowsingService::InitURLRequestContextOnIOThread, this,
           make_scoped_refptr(g_browser_process->system_request_context())));
 
 #if defined(FULL_SAFE_BROWSING)
 #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.
   // The SafeBrowsingService will be started if any existing profile has the
   // preference enabled. It will also listen for updates to the preferences.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (profile_manager) {
     std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
     // TODO(felt): I believe this for-loop is dead code. Confirm this and
     // remove in a future CL. See https://codereview.chromium.org/1341533002/
@@ skipping 97 matching lines @@
     Profile* profile) const {
 #if defined(FULL_SAFE_BROWSING)
   return incident_service_->CreatePreferenceValidationDelegate(profile);
 #else
   return scoped_ptr<TrackedPreferenceValidationDelegate>();
 #endif
 }
 
 #if defined(FULL_SAFE_BROWSING)
 void SafeBrowsingService::RegisterDelayedAnalysisCallback(
-    const safe_browsing::DelayedAnalysisCallback& callback) {
+    const DelayedAnalysisCallback& callback) {
   incident_service_->RegisterDelayedAnalysisCallback(callback);
 }
 #endif
 
 void SafeBrowsingService::AddDownloadManager(
     content::DownloadManager* download_manager) {
 #if defined(FULL_SAFE_BROWSING)
   incident_service_->AddDownloadManager(download_manager);
 #endif
 }
@@ skipping 15 matching lines @@
 #if defined(SAFE_BROWSING_DB_LOCAL)
   return new LocalSafeBrowsingDatabaseManager(this);
 #elif defined(SAFE_BROWSING_DB_REMOTE)
   return new RemoteSafeBrowsingDatabaseManager();
 #else
   return NULL;
 #endif
 }
 
 #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
 }
 
 void SafeBrowsingService::InitURLRequestContextOnIOThread(
     net::URLRequestContextGetter* system_url_request_context_getter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!url_request_context_.get());
 
@@ skipping 223 matching lines @@
 
   state_callback_list_.Notify();
 
 #if defined(FULL_SAFE_BROWSING)
   if (csd_service_)
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_)
     download_service_->SetEnabled(enable);
 #endif
 }
+
+}  // namespace safe_browsing