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

chrome/browser/safe_browsing/threat_details_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 <algorithm>
 
 #include "base/bind.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 41 matching lines @@
 static const char* kLandingHeaders =
     "HTTP/1.1 200 OK\n"
     "Content-Type: text/html\n"
     "Content-Length: 1024\n"
     "Set-Cookie: tastycookie\n";  // This header is stripped.
 static const char* kLandingData =
     "<iframe src='http://www.malware.com/with/path'>";
 
 using content::BrowserThread;
 using content::WebContents;
-using safe_browsing::ClientMalwareReportRequest;
 
-namespace {
+namespace safe_browsing {
 
 void WriteHeaders(disk_cache::Entry* entry, const std::string& headers) {
   net::HttpResponseInfo responseinfo;
   std::string raw_headers =
       net::HttpUtil::AssembleRawHeaders(headers.c_str(), headers.size());
   responseinfo.socket_address = net::HostPortPair("1.2.3.4", 80);
   responseinfo.headers = new net::HttpResponseHeaders(raw_headers);
 
   base::Pickle pickle;
   responseinfo.Persist(&pickle, false, false);
@@ skipping 92 matching lines @@
   }
 
   const std::string& GetSerialized() { return serialized_; }
 
  private:
   ~MockSafeBrowsingUIManager() override {}
 
   std::string serialized_;
   DISALLOW_COPY_AND_ASSIGN(MockSafeBrowsingUIManager);
 };
 

[mattm, 2015/11/11 01:10:16]

Keep the anon namespace inside the new namespace.

[vakh (old account. dont use), 2015/11/11 18:59:53]

Done.

-}  // namespace.
-
 class ThreatDetailsTest : public ChromeRenderViewHostTestHarness {
  public:
   typedef SafeBrowsingUIManager::UnsafeResource UnsafeResource;
 
   ThreatDetailsTest() : ui_manager_(new MockSafeBrowsingUIManager()) {}
 
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     ASSERT_TRUE(profile()->CreateHistoryService(true /* delete_file */,
                                                 false /* no_db */));
@@ skipping 364 matching lines @@
 
   ClientMalwareReportRequest expected;
   expected.set_malware_url(kMalwareURL);
   expected.set_page_url(kLandingURL);
   expected.set_referrer_url("");
   expected.set_did_proceed(true);
 
   ClientMalwareReportRequest::Resource* pb_resource = expected.add_resources();
   pb_resource->set_id(0);
   pb_resource->set_url(kLandingURL);
-  safe_browsing::ClientMalwareReportRequest::HTTPResponse* pb_response =
+  ClientMalwareReportRequest::HTTPResponse* pb_response =
       pb_resource->mutable_response();
   pb_response->mutable_firstline()->set_code(200);
-  safe_browsing::ClientMalwareReportRequest::HTTPHeader* pb_header =
+  ClientMalwareReportRequest::HTTPHeader* pb_header =
       pb_response->add_headers();
   pb_header->set_name("Content-Type");
   pb_header->set_value("text/html");
   pb_header = pb_response->add_headers();
   pb_header->set_name("Content-Length");
   pb_header->set_value("1024");
   pb_header = pb_response->add_headers();
   pb_header->set_name("Set-Cookie");
   pb_header->set_value("");  // The cookie is dropped.
   pb_response->set_body(kLandingData);
@@ skipping 112 matching lines @@
   pb_resource = expected.add_resources();
   pb_resource->set_id(2);
   pb_resource->set_parent_id(3);
   pb_resource->set_url(kSecondRedirectURL);
   pb_resource = expected.add_resources();
   pb_resource->set_id(3);
   pb_resource->set_url(kFirstRedirectURL);
 
   VerifyResults(actual, expected);
 }
+
+}  // namespace safe_browsing