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

chrome/browser/safe_browsing/safe_browsing_service.h

 // 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 
@@ skipping 12 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 #if defined(FULL_SAFE_BROWSING)
 #include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h"
 #endif
 
 class PrefChangeRegistrar;
 class PrefService;
 class Profile;
-struct SafeBrowsingProtocolConfig;
-class SafeBrowsingDatabaseManager;
-class SafeBrowsingPingManager;
-class SafeBrowsingProtocolManager;
-class SafeBrowsingProtocolManagerDelegate;
-class SafeBrowsingServiceFactory;
-class SafeBrowsingUIManager;
-class SafeBrowsingURLRequestContextGetter;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
 class Thread;
 }
 
 namespace content {
 class DownloadManager;
 }
 
 namespace net {
 class URLRequest;
 class URLRequestContext;
 class URLRequestContextGetter;
 }
 
 namespace safe_browsing {
 class ClientSideDetectionService;
 class DownloadProtectionService;
+struct SafeBrowsingProtocolConfig;
+class SafeBrowsingDatabaseManager;
+class SafeBrowsingPingManager;
+class SafeBrowsingProtocolManager;
+class SafeBrowsingProtocolManagerDelegate;
+class SafeBrowsingServiceFactory;
+class SafeBrowsingUIManager;
+class SafeBrowsingURLRequestContextGetter;
 
 #if defined(FULL_SAFE_BROWSING)
 class IncidentReportingService;
 class OffDomainInclusionDetector;
 class ResourceRequestDetector;
 #endif
-}  // namespace safe_browsing
 
 // Construction needs to happen on the main thread.
 // The SafeBrowsingService owns both the UI and Database managers which do
 // the heavylifting of safebrowsing service. Both of these managers stay
 // alive until SafeBrowsingService is destroyed, however, they are disabled
 // permanently when Shutdown method is called.
 class SafeBrowsingService
     : public base::RefCountedThreadSafe<
           SafeBrowsingService,
           content::BrowserThread::DeleteOnUIThread>,
@@ skipping 31 matching lines @@
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     return enabled_;
   }
 
   // Whether the service is enabled by the current set of profiles.
   bool enabled_by_prefs() const {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return enabled_by_prefs_;
   }
 
-  safe_browsing::ClientSideDetectionService*
+  ClientSideDetectionService*
       safe_browsing_detection_service() const {

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:42]

Done.

     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return csd_service_.get();
   }
 
   // The DownloadProtectionService is not valid after the SafeBrowsingService
   // is destroyed.
-  safe_browsing::DownloadProtectionService*
+  DownloadProtectionService*
       download_protection_service() const {

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return download_service_.get();
   }
 
   net::URLRequestContextGetter* url_request_context();
 
   const scoped_refptr<SafeBrowsingUIManager>& ui_manager() const;
 
   const scoped_refptr<SafeBrowsingDatabaseManager>& database_manager() const;
 
   SafeBrowsingProtocolManager* protocol_manager() const;
 
   SafeBrowsingPingManager* ping_manager() const;
 
   // Returns a preference validation delegate that adds incidents to the
   // incident reporting service for validation failures. Returns NULL if the
   // service is not applicable for the given profile.
   scoped_ptr<TrackedPreferenceValidationDelegate>
       CreatePreferenceValidationDelegate(Profile* profile) const;
 
 #if defined(FULL_SAFE_BROWSING)
   // Registers |callback| to be run after some delay following process launch.
   // |callback| will be dropped if the service is not applicable for the
   // process.
   void RegisterDelayedAnalysisCallback(
-      const safe_browsing::DelayedAnalysisCallback& callback);
+      const DelayedAnalysisCallback& callback);

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

 #endif
 
   // Adds |download_manager| to the set monitored by safe browsing.
   void AddDownloadManager(content::DownloadManager* download_manager);
 
   // Observes resource requests made by the renderer and reports suspicious
   // activity.
   void OnResourceRequest(const net::URLRequest* request);
 
   // Type for subscriptions to SafeBrowsing service state.
   typedef base::CallbackList<void(void)>::Subscription StateSubscription;
 
   // Adds a listener for when SafeBrowsing preferences might have changed.
   // To get the current state, the callback should call enabled_by_prefs().
   // Should only be called on the UI thread.
   scoped_ptr<StateSubscription> RegisterStateCallback(
       const base::Callback<void(void)>& callback);
 
  protected:
   // Creates the safe browsing service.  Need to initialize before using.
   SafeBrowsingService();
 
   ~SafeBrowsingService() override;
 
   virtual SafeBrowsingDatabaseManager* CreateDatabaseManager();
 
   virtual SafeBrowsingUIManager* CreateUIManager();
 
 #if defined(FULL_SAFE_BROWSING)
-  virtual safe_browsing::IncidentReportingService*
+  virtual IncidentReportingService*
   CreateIncidentReportingService();

[mattm, 2015/11/12 00:36:05]

This should fit on a single line

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

 #endif
 
   // Registers all the delayed analysis with the incident reporting service.
   // This is where you register your process-wide, profile-independent analysis.
   virtual void RegisterAllDelayedAnalysis();
 
   // Return a ptr to DatabaseManager's delegate, or NULL if it doesn't have one.
   virtual SafeBrowsingProtocolManagerDelegate* GetProtocolManagerDelegate();
 
  private:
@@ skipping 85 matching lines @@
   // Used to track creation and destruction of profiles on the UI thread.
   content::NotificationRegistrar prefs_registrar_;
 
   // Callbacks when SafeBrowsing state might have changed.
   // Should only be accessed on the UI thread.
   base::CallbackList<void(void)> state_callback_list_;
 
   // The ClientSideDetectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
   // Accessed on UI thread.
-  scoped_ptr<safe_browsing::ClientSideDetectionService> csd_service_;
+  scoped_ptr<ClientSideDetectionService> csd_service_;
 
   // The DownloadProtectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
   // Accessed on UI thread.
-  scoped_ptr<safe_browsing::DownloadProtectionService> download_service_;
+  scoped_ptr<DownloadProtectionService> download_service_;
 
 #if defined(FULL_SAFE_BROWSING)
-  scoped_ptr<safe_browsing::IncidentReportingService> incident_service_;
+  scoped_ptr<IncidentReportingService> incident_service_;
 #endif
 
   // The UI manager handles showing interstitials.  Accessed on both UI and IO
   // thread.
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
 
   // The database manager handles the database and download logic.  Accessed on
   // both UI and IO thread.
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
 
 #if defined(FULL_SAFE_BROWSING)
-  scoped_ptr<safe_browsing::OffDomainInclusionDetector>
-      off_domain_inclusion_detector_;
+  scoped_ptr<OffDomainInclusionDetector> off_domain_inclusion_detector_;
 
-  scoped_ptr<safe_browsing::ResourceRequestDetector> resource_request_detector_;
+  scoped_ptr<ResourceRequestDetector> resource_request_detector_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingService);
 };
 
 // Factory for creating SafeBrowsingService.  Useful for tests.
 class SafeBrowsingServiceFactory {
  public:
   SafeBrowsingServiceFactory() { }
   virtual ~SafeBrowsingServiceFactory() { }
   virtual SafeBrowsingService* CreateSafeBrowsingService() = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactory);
 };
 
+}  // namespace safe_browsing
+
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_