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

chrome/browser/safe_browsing/threat_details.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_THREAT_DETAILS_H_
 #define CHROME_BROWSER_SAFE_BROWSING_THREAT_DETAILS_H_
 
 // A class that encapsulates the detailed threat reports sent when
 // users opt-in to do so from the safe browsing warning page.
 
@@ skipping 11 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "net/base/completion_callback.h"
 
 namespace net {
 class URLRequestContextGetter;
 }
 
-class ThreatDetailsCacheCollector;
-class ThreatDetailsRedirectsCollector;
-class ThreatDetailsFactory;
 class Profile;
 struct SafeBrowsingHostMsg_ThreatDOMDetails_Node;
 
 namespace safe_browsing {
+
 // Maps a URL to its Resource.
+class ThreatDetailsCacheCollector;
+class ThreatDetailsRedirectsCollector;
+class ThreatDetailsFactory;
+
 typedef base::hash_map<
     std::string,
-    linked_ptr<safe_browsing::ClientSafeBrowsingReportRequest::Resource>>
+    linked_ptr<ClientSafeBrowsingReportRequest::Resource>>
     ResourceMap;
-}
 
 class ThreatDetails : public base::RefCountedThreadSafe<ThreatDetails>,
                       public content::WebContentsObserver {
  public:
   typedef SafeBrowsingUIManager::UnsafeResource UnsafeResource;
 
   // Constructs a new ThreatDetails instance, using the factory.
   static ThreatDetails* NewThreatDetails(SafeBrowsingUIManager* ui_manager,
                                          content::WebContents* web_contents,
                                          const UnsafeResource& resource);
@@ skipping 28 matching lines @@
 
   ~ThreatDetails() override;
 
   // Called on the IO thread with the DOM details.
   virtual void AddDOMDetails(
       const std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node>& params);
 
   Profile* profile_;
 
   // The report protocol buffer.
   scoped_ptr<safe_browsing::ClientSafeBrowsingReportRequest> report_;

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

more safe_browsing:: that could be removed in this file

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

Done.

 
   // Used to get a pointer to the HTTP cache.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
  private:
   friend class base::RefCountedThreadSafe<ThreatDetails>;
 
   // Starts the collection of the report.
   void StartCollection();
 
@@ skipping 18 matching lines @@
       const std::vector<SafeBrowsingHostMsg_ThreatDOMDetails_Node>& params);
 
   void AddRedirectUrlList(const std::vector<GURL>& urls);
 
   scoped_refptr<SafeBrowsingUIManager> ui_manager_;
 
   const UnsafeResource resource_;
 
   // For every Url we collect we create a Resource message. We keep
   // them in a map so we can avoid duplicates.
-  safe_browsing::ResourceMap resources_;
+  ResourceMap resources_;
 
   // Result from the cache extractor.
   bool cache_result_;
 
   // Whether user did proceed with the safe browsing blocking page or
   // not.
   bool did_proceed_;
 
   // How many times this user has visited this page before.
   int num_visits_;
@@ skipping 21 matching lines @@
 class ThreatDetailsFactory {
  public:
   virtual ~ThreatDetailsFactory() {}
 
   virtual ThreatDetails* CreateThreatDetails(
       SafeBrowsingUIManager* ui_manager,
       content::WebContents* web_contents,
       const SafeBrowsingUIManager::UnsafeResource& unsafe_resource) = 0;
 };
 
+}  // namespace safe_browsing
+
 #endif  // CHROME_BROWSER_SAFE_BROWSING_THREAT_DETAILS_H_