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

chrome/browser/safe_browsing/protocol_manager_unittest.cc

 // 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.
 //
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 46 matching lines @@
   '\x08',                    // field 1, wire format varint
   '\x05',                    // chunk_number varint 5
   '\x22',                    // field 4, wire format length-delimited
   '\x04',                    // varint length 4
   'e', 'f', 'g', 'h'         // 4-byte prefix
 };
 const std::string kChunkPayload2(kRawChunkPayload2, sizeof(kRawChunkPayload2));
 
 }  // namespace
 
+namespace safe_browsing {
+
 class SafeBrowsingProtocolManagerTest : public testing::Test {
  protected:
   std::string key_param_;
 
   void SetUp() override {
     std::string key = google_apis::GetAPIKey();
     if (!key.empty()) {
       key_param_ = base::StringPrintf(
           "&key=%s",
           net::EscapeQueryParamValue(key, true).c_str());
@@ skipping 94 matching lines @@
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestChunkStrings) {
   scoped_ptr<SafeBrowsingProtocolManager> pm(CreateProtocolManager(NULL));
 
   // Add and Sub chunks.
   SBListChunkRanges phish(kDefaultPhishList);
   phish.adds = "1,4,6,8-20,99";
   phish.subs = "16,32,64-96";
   EXPECT_EQ(base::StringPrintf("%s;a:1,4,6,8-20,99:s:16,32,64-96\n",
                                kDefaultPhishList),
-            safe_browsing::FormatList(phish));
+            FormatList(phish));
 
   // Add chunks only.
   phish.subs = "";
-  EXPECT_EQ(base::StringPrintf("%s;a:1,4,6,8-20,99\n",
-                               kDefaultPhishList),
-            safe_browsing::FormatList(phish));
+  EXPECT_EQ(base::StringPrintf("%s;a:1,4,6,8-20,99\n", kDefaultPhishList),
+            FormatList(phish));
 
   // Sub chunks only.
   phish.adds = "";
   phish.subs = "16,32,64-96";
-  EXPECT_EQ(base::StringPrintf("%s;s:16,32,64-96\n",
-                               kDefaultPhishList),
-            safe_browsing::FormatList(phish));
+  EXPECT_EQ(base::StringPrintf("%s;s:16,32,64-96\n", kDefaultPhishList),
+            FormatList(phish));
 
   // No chunks of either type.
   phish.adds = "";
   phish.subs = "";
-  EXPECT_EQ(base::StringPrintf("%s;\n", kDefaultPhishList),
-            safe_browsing::FormatList(phish));
+  EXPECT_EQ(base::StringPrintf("%s;\n", kDefaultPhishList), FormatList(phish));
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestGetHashBackOffTimes) {
   scoped_ptr<SafeBrowsingProtocolManager> pm(CreateProtocolManager(NULL));
 
   // No errors or back off time yet.
   EXPECT_EQ(0U, pm->gethash_error_count_);
   EXPECT_TRUE(pm->next_gethash_time_.is_null());
 
   Time now = Time::Now();
@@ skipping 190 matching lines @@
 // Tests the contents of the POST body when there are contents in the
 // local database. This is not exhaustive, as the actual list formatting
 // is covered by SafeBrowsingProtocolManagerTest.TestChunkStrings.
 TEST_F(SafeBrowsingProtocolManagerTest, ExistingDatabase) {
   scoped_refptr<base::TestSimpleTaskRunner> runner(
       new base::TestSimpleTaskRunner());
   base::ThreadTaskRunnerHandle runner_handler(runner);
   net::TestURLFetcherFactory url_fetcher_factory;
 
   std::vector<SBListChunkRanges> ranges;
-  SBListChunkRanges range_phish(safe_browsing::kPhishingList);
+  SBListChunkRanges range_phish(kPhishingList);
   range_phish.adds = "adds_phish";
   range_phish.subs = "subs_phish";
   ranges.push_back(range_phish);
 
   SBListChunkRanges range_unknown("unknown_list");
   range_unknown.adds = "adds_unknown";
   range_unknown.subs = "subs_unknown";
   ranges.push_back(range_unknown);
 
   testing::StrictMock<MockProtocolDelegate> test_delegate;
@@ skipping 702 matching lines @@
   second_chunk_url_fetcher->delegate()->OnURLFetchComplete(
       second_chunk_url_fetcher);
 
   EXPECT_FALSE(pm->IsUpdateScheduled());
 
   // Invoke the AddChunksCallback to finish the update.
   runner->RunPendingTasks();
 
   EXPECT_TRUE(pm->IsUpdateScheduled());
 }
+
+}  // namespace safe_browsing