Move fetchers into mojo/shell/fetcher

mojo/shell/fetcher/network_fetcher_unittest.cc

 // Copyright 2015 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 "mojo/fetcher/network_fetcher.h"
+#include "mojo/shell/fetcher/network_fetcher.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace fetcher {
+namespace shell {
 namespace {
 
 const char k200Request[] = "http://request_expect_200";
 const char k404Request[] = "http://request_expect_404";
 const char k504Request[] = "http://request_expect_504";
 const char kErrorRequest[] = "http://request_expect_error";
 
 class TestURLLoaderImpl : public URLLoader {
  public:
   explicit TestURLLoaderImpl(InterfaceRequest<URLLoader> request)
@@ skipping 47 matching lines @@
 
   StrongBinding<URLLoaderFactory> binding_;
   DISALLOW_COPY_AND_ASSIGN(TestURLLoaderFactoryImpl);
 };
 
 class FetchCallbackHelper {
  public:
   FetchCallbackHelper() : run_loop_(nullptr) {}
   ~FetchCallbackHelper() {}
 
-  shell::Fetcher::FetchCallback GetCallback() {
+  Fetcher::FetchCallback GetCallback() {
     return base::Bind(&FetchCallbackHelper::CallbackHandler,
                       base::Unretained(this));
   }
 
   void WaitForCallback() {
     base::RunLoop run_loop;
     base::AutoReset<base::RunLoop*> auto_reset(&run_loop_, &run_loop);
     run_loop.Run();
   }
 
-  shell::Fetcher* fetcher() const { return fetcher_.get(); }
+  Fetcher* fetcher() const { return fetcher_.get(); }
 
  private:
-  void CallbackHandler(scoped_ptr<shell::Fetcher> fetcher) {
+  void CallbackHandler(scoped_ptr<Fetcher> fetcher) {
     fetcher_ = std::move(fetcher);
     if (run_loop_)
       run_loop_->Quit();
   }
 
   // If it is not null, it points to a stack-allocated base::RunLoop instance in
   // WaitForCallback().
   base::RunLoop* run_loop_;
-  scoped_ptr<shell::Fetcher> fetcher_;
+  scoped_ptr<Fetcher> fetcher_;
   DISALLOW_COPY_AND_ASSIGN(FetchCallbackHelper);
 };
 
 class NetworkFetcherTest : public testing::Test {
  public:
   NetworkFetcherTest() {}
   ~NetworkFetcherTest() override {}
 
  protected:
   // Overridden from testing::Test:
@@ skipping 43 matching lines @@
 
 TEST_F(NetworkFetcherTest, FetchSucceeded504) {
   TestFetchURL(k504Request, true, 504u);
 }
 
 TEST_F(NetworkFetcherTest, FetchFailed) {
   TestFetchURL(kErrorRequest, false, 0u);
 }
 
 }  // namespace
-}  // namespace fetcher
+}  // namespace shell
 }  // namespace mojo