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

chrome/browser/safe_browsing/safe_browsing_store_file.cc

Index: chrome/browser/safe_browsing/safe_browsing_store_file.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
index 122b517880f89589fccce3c80af88ea64a275bc3..1673305bf709b0ae2c322455e7a41142652378eb 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
@@ -13,6 +13,16 @@
 
 namespace {
 
+using safe_browsing::SBAddFullHash;
+using safe_browsing::SBAddPrefix;
+using safe_browsing::SBAddPrefixes;
+using safe_browsing::SBAddPrefixHashLess;
+using safe_browsing::SBAddPrefixLess;
+using safe_browsing::SBPrefix;
+using safe_browsing::SBSubFullHash;
+using safe_browsing::SBSubPrefix;
+using safe_browsing::SBSubPrefixes;

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

Put this namespace inside the namespace safe_browsing to avoid this

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

Done.

+
 // NOTE(shess): kFileMagic should not be a byte-wise palindrome, so
 // that byte-order changes force corruption.
 const int32 kFileMagic = 0x600D71FE;
@@ -555,6 +565,8 @@ bool ReadDbStateHelper(const base::FilePath& filename,
 
 }  // namespace
 
+namespace safe_browsing {
+
 SafeBrowsingStoreFile::SafeBrowsingStoreFile(
     const scoped_refptr<const base::SequencedTaskRunner>& task_runner)
     : task_runner_(task_runner),
@@ -820,7 +832,7 @@ bool SafeBrowsingStoreFile::FinishChunk() {
 }
 
 bool SafeBrowsingStoreFile::DoUpdate(
-    safe_browsing::PrefixSetBuilder* builder,
+    PrefixSetBuilder* builder,
     std::vector<SBAddFullHash>* add_full_hashes_result) {
   DCHECK(CalledOnValidThread());
   DCHECK(file_.get() || empty_);
@@ -1068,7 +1080,7 @@ bool SafeBrowsingStoreFile::DoUpdate(
 }
 
 bool SafeBrowsingStoreFile::FinishUpdate(
-    safe_browsing::PrefixSetBuilder* builder,
+    PrefixSetBuilder* builder,
     std::vector<SBAddFullHash>* add_full_hashes_result) {
   DCHECK(CalledOnValidThread());
   DCHECK(builder);
@@ -1163,3 +1175,5 @@ bool SafeBrowsingStoreFile::DeleteStore(const base::FilePath& basename) {
 
   return true;
 }
+
+}  // namespace safe_browsing