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

chrome/browser/extensions/blacklist.h

 // Copyright 2013 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_EXTENSIONS_BLACKLIST_H_
 #define CHROME_BROWSER_EXTENSIONS_BLACKLIST_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 35 matching lines @@
    protected:
     virtual ~Observer();
 
    private:
     Blacklist* blacklist_;
   };
 
   class ScopedDatabaseManagerForTest {
    public:
     explicit ScopedDatabaseManagerForTest(
-        scoped_refptr<SafeBrowsingDatabaseManager> database_manager);
+        scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+            database_manager);
 
     ~ScopedDatabaseManagerForTest();
 
    private:
-    scoped_refptr<SafeBrowsingDatabaseManager> original_;
+    scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> original_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedDatabaseManagerForTest);
   };
 
   typedef std::map<std::string, BlacklistState> BlacklistStateMap;
 
   typedef base::Callback<void(const BlacklistStateMap&)>
       GetBlacklistedIDsCallback;
 
   typedef base::Callback<void(const std::set<std::string>&)>
@@ skipping 37 matching lines @@
   // BlacklistStateFetcher.
   BlacklistStateFetcher* ResetBlacklistStateFetcherForTest();
 
   // Adds/removes an observer to the blacklist.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
  private:
   // Use via ScopedDatabaseManagerForTest.
   static void SetDatabaseManager(
-      scoped_refptr<SafeBrowsingDatabaseManager> database_manager);
-  static scoped_refptr<SafeBrowsingDatabaseManager> GetDatabaseManager();
+      scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+          database_manager);
+  static scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>
+  GetDatabaseManager();

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

formatting

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

Done.

 
   // content::NotificationObserver
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   void GetBlacklistStateForIDs(const GetBlacklistedIDsCallback& callback,
                                const std::set<std::string>& blacklisted_ids);
 
   void RequestExtensionsBlacklistState(const std::set<std::string>& ids,
@@ skipping 22 matching lines @@
   // GetBlacklistedIDs and deleted when the callback is called from
   // OnBlacklistStateReceived.
   StateRequestsList state_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(Blacklist);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_BLACKLIST_H_