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

 // 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/safe_browsing_store_file.h"
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/md5.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "components/safe_browsing_db/prefix_set.h"
 
 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;
 
 // Version history:
 // Version 6: aad08754/r2814 by erikkay@google.com on 2008-10-02 (sqlite)
 // Version 7: 6afe28a5/r37435 by shess@chromium.org on 2010-01-28
 // Version 8: d3dd0715/r259791 by shess@chromium.org on 2014-03-27
 const int32 kFileVersion = 8;
 
@@ skipping 522 matching lines @@
 
   int64 size = 0;
   if (!base::GetFileSize(filename, &size))
     return false;
 
   return static_cast<int64>(ftell(file.get())) == size;
 }
 
 }  // namespace
 
+namespace safe_browsing {
+
 SafeBrowsingStoreFile::SafeBrowsingStoreFile(
     const scoped_refptr<const base::SequencedTaskRunner>& task_runner)
     : task_runner_(task_runner),
       chunks_written_(0),
       empty_(false),
       corruption_seen_(false) {
 }
 
 SafeBrowsingStoreFile::~SafeBrowsingStoreFile() {
   // Thread-checking is disabled in the destructor due to crbug.com/338486.
@@ skipping 245 matching lines @@
       !WriteContainer(sub_hashes_, new_file_.get(), NULL))
     return false;
 
   ++chunks_written_;
 
   // Clear everything to save memory.
   return ClearChunkBuffers();
 }
 
 bool SafeBrowsingStoreFile::DoUpdate(
-    safe_browsing::PrefixSetBuilder* builder,
+    PrefixSetBuilder* builder,
     std::vector<SBAddFullHash>* add_full_hashes_result) {
   DCHECK(CalledOnValidThread());
   DCHECK(file_.get() || empty_);
   DCHECK(new_file_.get());
   CHECK(builder);
   CHECK(add_full_hashes_result);
 
   // Rewind the temporary storage.
   if (!FileRewind(new_file_.get()))
     return false;
@@ skipping 227 matching lines @@
     return false;
 
   // Record counts before swapping to caller.
   UMA_HISTOGRAM_COUNTS("SB2.AddPrefixes", add_prefix_count);
   UMA_HISTOGRAM_COUNTS("SB2.SubPrefixes", sub_prefix_count);
 
   return true;
 }
 
 bool SafeBrowsingStoreFile::FinishUpdate(
-    safe_browsing::PrefixSetBuilder* builder,
+    PrefixSetBuilder* builder,
     std::vector<SBAddFullHash>* add_full_hashes_result) {
   DCHECK(CalledOnValidThread());
   DCHECK(builder);
   DCHECK(add_full_hashes_result);
 
   if (!DoUpdate(builder, add_full_hashes_result)) {
     CancelUpdate();
     return false;
   }
 
@@ skipping 74 matching lines @@
   // With SQLite support gone, one way to get to this code is if the
   // existing file is a SQLite file.  Make sure the journal file is
   // also removed.
   const base::FilePath journal_filename(
       basename.value() + FILE_PATH_LITERAL("-journal"));
   if (base::PathExists(journal_filename))
     base::DeleteFile(journal_filename, false);
 
   return true;
 }
+
+}  // namespace safe_browsing