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

chrome/browser/safe_browsing/two_phase_uploader_unittest.cc

 // Copyright 2013 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/two_phase_uploader.h"
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/safe_browsing/local_two_phase_testserver.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::MessageLoopRunner;
 
-namespace {
+namespace safe_browsing {
 
 class Delegate {
  public:
   Delegate() : state_(TwoPhaseUploader::STATE_NONE) {
   }
 
   void ProgressCallback(int64 current, int64 total) {}
 
   void FinishCallback(scoped_refptr<MessageLoopRunner> runner,
                       TwoPhaseUploader::State state,
@@ skipping 16 matching lines @@
 base::FilePath GetTestFilePath() {
   base::FilePath file_path;
   PathService::Get(base::DIR_SOURCE_ROOT, &file_path);
   file_path = file_path.Append(FILE_PATH_LITERAL("net"));
   file_path = file_path.Append(FILE_PATH_LITERAL("data"));
   file_path = file_path.Append(FILE_PATH_LITERAL("url_request_unittest"));
   file_path = file_path.Append(FILE_PATH_LITERAL("BullRunSpeech.txt"));
   return file_path;
 }
 
-}  // namespace

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

-
 class TwoPhaseUploaderTest : public testing::Test {
  public:
   TwoPhaseUploaderTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         url_request_context_getter_(new net::TestURLRequestContextGetter(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))) {
   }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
@@ skipping 111 matching lines @@
       base::Bind(&Delegate::ProgressCallback, base::Unretained(&delegate)),
       base::Bind(
           &Delegate::FinishCallback, base::Unretained(&delegate), runner)));
   uploader->Start();
   runner->Run();
   EXPECT_EQ(TwoPhaseUploader::UPLOAD_FILE, delegate.state_);
   EXPECT_EQ(net::ERR_EMPTY_RESPONSE, delegate.net_error_);
   EXPECT_EQ(net::URLFetcher::RESPONSE_CODE_INVALID, delegate.response_code_);
   EXPECT_EQ("", delegate.response_);
 }
+
+}  // namespace safe_browsing