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

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

Index: chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 222cb7b9d30d3f2220a20e1a3f821c0679e748b8..a2807feabbec785fe0e0edac5127dad66b9566b2 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -413,6 +413,8 @@ class ServiceEnabledHelper : public base::ThreadTestHelper {
 
 }  // namespace
 
+namespace safe_browsing {
+
 // Tests the safe browsing blocking page in a browser.
 class SafeBrowsingServiceTest : public InProcessBrowserTest {
  public:
@@ -527,8 +529,8 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest {
 
   void CreateCSDService() {
 #if defined(SAFE_BROWSING_CSD)
-    safe_browsing::ClientSideDetectionService* csd_service =
-        safe_browsing::ClientSideDetectionService::Create(NULL);
+    ClientSideDetectionService* csd_service =
+        ClientSideDetectionService::Create(NULL);
     SafeBrowsingService* sb_service =
         g_browser_process->safe_browsing_service();
 
@@ -603,17 +605,17 @@ class SafeBrowsingServiceMetadataTest
                                         SBFullHashResult* full_hash) {
     GenUrlFullhashResult(url, safe_browsing::MALWARE, full_hash);
 
-    safe_browsing::MalwarePatternType proto;
+    MalwarePatternType proto;
     switch (GetParam()) {
       case METADATA_NONE:
         full_hash->metadata = std::string();
         break;
       case METADATA_LANDING:
-        proto.set_pattern_type(safe_browsing::MalwarePatternType::LANDING);
+        proto.set_pattern_type(MalwarePatternType::LANDING);
         full_hash->metadata = proto.SerializeAsString();
         break;
       case METADATA_DISTRIBUTION:
-        proto.set_pattern_type(safe_browsing::MalwarePatternType::DISTRIBUTION);
+        proto.set_pattern_type(MalwarePatternType::DISTRIBUTION);
         full_hash->metadata = proto.SerializeAsString();
         break;
     }
@@ -1057,7 +1059,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest,
 IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, StartAndStop) {
   CreateCSDService();
   SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
-  safe_browsing::ClientSideDetectionService* csd_service =
+  ClientSideDetectionService* csd_service =
       sb_service->safe_browsing_detection_service();
   PrefService* pref_service = browser()->profile()->GetPrefs();
 
@@ -1156,7 +1158,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceShutdownTest,
                        DontStartAfterShutdown) {
   CreateCSDService();
   SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
-  safe_browsing::ClientSideDetectionService* csd_service =
+  ClientSideDetectionService* csd_service =
       sb_service->safe_browsing_detection_service();
   PrefService* pref_service = browser()->profile()->GetPrefs();
 
@@ -1360,3 +1362,5 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingDatabaseManagerCookieTest,
       base::Bind(&SafeBrowsingDatabaseManagerCookieTest::ForceUpdate, this));
   observer.Wait();
 }
+
+}  // namespace safe_browsing