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

chrome/browser/safe_browsing/ui_manager.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 "chrome/browser/safe_browsing/ui_manager.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/debug/leak_tracker.h"
@@ skipping 18 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/ssl/ssl_info.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
 using content::NavigationEntry;
 using content::WebContents;
 
-namespace {
+namespace safe_browsing {
 

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

anon-namespace

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

Done.

 const void* const kWhitelistKey = &kWhitelistKey;
 
 class WhitelistUrlSet : public base::SupportsUserData::Data {
  public:
   WhitelistUrlSet() {}
 
   bool Contains(const GURL url) {
     auto iter = set_.find(url.GetWithEmptyPath());
     return iter != set_.end();
   }
 
   void Insert(const GURL url) { set_.insert(url.GetWithEmptyPath()); }
 
  private:
   std::set<GURL> set_;
 
   DISALLOW_COPY_AND_ASSIGN(WhitelistUrlSet);
 };
 
-}  // namespace
-
 // SafeBrowsingUIManager::UnsafeResource ---------------------------------------
 
 SafeBrowsingUIManager::UnsafeResource::UnsafeResource()
     : is_subresource(false),
       threat_type(SB_THREAT_TYPE_SAFE),
       render_process_host_id(-1),
       render_view_id(-1),
       threat_source(FROM_UNKNOWN) {
 }
 
@@ skipping 39 matching lines @@
 
 void SafeBrowsingUIManager::DisplayBlockingPage(
     const UnsafeResource& resource) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (resource.is_subresource && !resource.is_subframe) {
     // Sites tagged as serving Unwanted Software should only show a warning for
     // main-frame or sub-frame resource. Similar warning restrictions should be
     // applied to malware sites tagged as "landing sites" (see "Types of
     // Malware sites" under
     // https://developers.google.com/safe-browsing/developers_guide_v3#UserWarnings).
-    safe_browsing::MalwarePatternType proto;
+    MalwarePatternType proto;
     if (resource.threat_type == SB_THREAT_TYPE_URL_UNWANTED ||
         (resource.threat_type == SB_THREAT_TYPE_URL_MALWARE &&
          !resource.threat_metadata.empty() &&
          proto.ParseFromString(resource.threat_metadata) &&
-         proto.pattern_type() == safe_browsing::MalwarePatternType::LANDING)) {
+         proto.pattern_type() == MalwarePatternType::LANDING)) {
       if (!resource.callback.is_null()) {
         BrowserThread::PostTask(
             BrowserThread::IO, FROM_HERE, base::Bind(resource.callback, true));
       }
       return;
     }
   }
 
   // Indicate to interested observers that the resource in question matched the
   // SB filters.
@@ skipping 191 matching lines @@
       resource.render_process_host_id, resource.render_view_id);
 
   GURL maybe_whitelisted_url(
       resource.is_subresource ? web_contents->GetVisibleURL() : resource.url);
   WhitelistUrlSet* site_list =
       static_cast<WhitelistUrlSet*>(web_contents->GetUserData(kWhitelistKey));
   if (!site_list)
     return false;
   return site_list->Contains(maybe_whitelisted_url);
 }
+
+}  // namespace safe_browsing