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.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 
 #include <set>
 #include <vector>
 
 #include "chrome/browser/safe_browsing/safe_browsing_store.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/sequenced_task_runner.h"
 
+namespace safe_browsing {
+
 // Implement SafeBrowsingStore in terms of a flat file.  The file
 // format is pretty literal:
 //
 // int32 magic;             // magic number "validating" file
 // int32 version;           // format version
 //
 // // Counts for the various data which follows the header.
 // uint32 add_chunk_count;  // Chunks seen, including empties.
 // uint32 sub_chunk_count;  // Ditto.
 // uint32 shard_stride;     // SBPrefix space covered per shard.
@@ skipping 119 matching lines @@
   bool WriteSubPrefix(int32 chunk_id,
                       int32 add_chunk_id,
                       SBPrefix prefix) override;
   bool WriteSubHash(int32 chunk_id,
                     int32 add_chunk_id,
                     const SBFullHash& full_hash) override;
   bool FinishChunk() override;
 
   bool BeginUpdate() override;
   bool FinishUpdate(
-      safe_browsing::PrefixSetBuilder* builder,
+      PrefixSetBuilder* builder,
       std::vector<SBAddFullHash>* add_full_hashes_result) override;
   bool CancelUpdate() override;
 
   void SetAddChunk(int32 chunk_id) override;
   bool CheckAddChunk(int32 chunk_id) override;
   void GetAddChunks(std::vector<int32>* out) override;
   void SetSubChunk(int32 chunk_id) override;
   bool CheckSubChunk(int32 chunk_id) override;
   void GetSubChunks(std::vector<int32>* out) override;
 
@@ skipping 14 matching lines @@
   // Delete any on-disk files, including the permanent storage.
   static bool DeleteStore(const base::FilePath& basename);
 
  private:
   // Checks whether the current thread is part of the sequenced task runner
   // this object was initialized with.
   bool CalledOnValidThread();
 
   // Does the actual update for FinishUpdate(), so that FinishUpdate() can clean
   // up correctly in case of error.
-  virtual bool DoUpdate(safe_browsing::PrefixSetBuilder* builder,
+  virtual bool DoUpdate(PrefixSetBuilder* builder,
                         std::vector<SBAddFullHash>* add_full_hashes_result);
 
   // Some very lucky users have an original-format file still in their
   // profile.  Check for it and delete, recording a histogram for the
   // result (no histogram for not-found).  Logically this
   // would make more sense at the SafeBrowsingDatabase level, but
   // practically speaking that code doesn't touch files directly.
   static void CheckForOriginalAndDelete(const base::FilePath& filename);
 
   // Close all files and clear all buffers.
@@ skipping 69 matching lines @@
   base::Closure corruption_callback_;
 
   // Tracks whether corruption has already been seen in the current
   // update, so that only one instance is recorded in the stats.
   // TODO(shess): Remove with format-migration support.
   bool corruption_seen_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingStoreFile);
 };
 
+}  // namespace safe_browsing
+
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_