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

chrome/browser/extensions/blacklist.cc

Index: chrome/browser/extensions/blacklist.cc
diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc
index ef1cdfe696222c9179d71bf3be866f517b86c9e5..e69a0a1c34bdb1a46d30759326bb75ceaf019c59 100644
--- a/chrome/browser/extensions/blacklist.cc
+++ b/chrome/browser/extensions/blacklist.cc
@@ -44,16 +44,16 @@ class LazySafeBrowsingDatabaseManager {
 #endif
   }
 
-  scoped_refptr<SafeBrowsingDatabaseManager> get() {
+  scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> get() {

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

My opinion: If there are more than 2 or 3 uses in a .cc, I'd put a 
 using safe_browsing::TheClass..;
up top.  Makes the code more readable.

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

Done.

     return instance_;
   }
 
-  void set(scoped_refptr<SafeBrowsingDatabaseManager> instance) {
+  void set(scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> instance) {
     instance_ = instance;
   }
 
  private:
-  scoped_refptr<SafeBrowsingDatabaseManager> instance_;
+  scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> instance_;
 };
 
 static base::LazyInstance<LazySafeBrowsingDatabaseManager> g_database_manager =
@@ -64,7 +64,7 @@ static base::LazyInstance<LazySafeBrowsingDatabaseManager> g_database_manager =
 //
 // Constructed on any thread but lives on the IO from then on.
 class SafeBrowsingClientImpl
-    : public SafeBrowsingDatabaseManager::Client,
+    : public safe_browsing::SafeBrowsingDatabaseManager::Client,
       public base::RefCountedThreadSafe<SafeBrowsingClientImpl> {
  public:
   typedef base::Callback<void(const std::set<std::string>&)> OnResultCallback;
@@ -90,7 +90,8 @@ class SafeBrowsingClientImpl
 
   // Pass |database_manager| as a parameter to avoid touching
   // SafeBrowsingService on the IO thread.
-  void StartCheck(scoped_refptr<SafeBrowsingDatabaseManager> database_manager,
+  void StartCheck(scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+                      database_manager,
                   const std::set<std::string>& extension_ids) {
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     if (database_manager->CheckExtensionIDs(extension_ids, this)) {
@@ -149,7 +150,7 @@ Blacklist::Observer::~Observer() {
 }
 
 Blacklist::ScopedDatabaseManagerForTest::ScopedDatabaseManagerForTest(
-    scoped_refptr<SafeBrowsingDatabaseManager> database_manager)
+    scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager)
     : original_(GetDatabaseManager()) {
   SetDatabaseManager(database_manager);
 }
@@ -159,13 +160,12 @@ Blacklist::ScopedDatabaseManagerForTest::~ScopedDatabaseManagerForTest() {
 }
 
 Blacklist::Blacklist(ExtensionPrefs* prefs) {
-  scoped_refptr<SafeBrowsingDatabaseManager> database_manager =
+  scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager =
       g_database_manager.Get().get();
   if (database_manager.get()) {
-    registrar_.Add(
-        this,
-        chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
-        content::Source<SafeBrowsingDatabaseManager>(database_manager.get()));
+    registrar_.Add(this, chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE,
+                   content::Source<safe_browsing::SafeBrowsingDatabaseManager>(
+                       database_manager.get()));
   }
 
   // Clear out the old prefs-backed blacklist, stored as empty extension entries
@@ -339,12 +339,14 @@ void Blacklist::RemoveObserver(Observer* observer) {
 
 // static
 void Blacklist::SetDatabaseManager(
-    scoped_refptr<SafeBrowsingDatabaseManager> database_manager) {
+    scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+        database_manager) {
   g_database_manager.Get().set(database_manager);
 }
 
 // static
-scoped_refptr<SafeBrowsingDatabaseManager> Blacklist::GetDatabaseManager() {
+scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+Blacklist::GetDatabaseManager() {
   return g_database_manager.Get().get();
 }