Move fetchers into mojo/shell/fetcher

mojo/shell/fetcher/network_fetcher_unittest.cc

Index: mojo/shell/fetcher/network_fetcher_unittest.cc
diff --git a/mojo/fetcher/network_fetcher_unittest.cc b/mojo/shell/fetcher/network_fetcher_unittest.cc
similarity index 94%
rename from mojo/fetcher/network_fetcher_unittest.cc
rename to mojo/shell/fetcher/network_fetcher_unittest.cc
index 9128b3a6efa5fa137a8eed8a303ecfe8452fccf3..ba58c4759a03a002c07aca7bb4d4cf8223268f30 100644
--- a/mojo/fetcher/network_fetcher_unittest.cc
+++ b/mojo/shell/fetcher/network_fetcher_unittest.cc
@@ -2,7 +2,7 @@
 // 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>
 
@@ -22,7 +22,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace fetcher {
+namespace shell {
 namespace {
 
 const char k200Request[] = "http://request_expect_200";
@@ -90,7 +90,7 @@ class FetchCallbackHelper {
   FetchCallbackHelper() : run_loop_(nullptr) {}
   ~FetchCallbackHelper() {}
 
-  shell::Fetcher::FetchCallback GetCallback() {
+  Fetcher::FetchCallback GetCallback() {
     return base::Bind(&FetchCallbackHelper::CallbackHandler,
                       base::Unretained(this));
   }
@@ -101,10 +101,10 @@ class FetchCallbackHelper {
     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();
@@ -113,7 +113,7 @@ class FetchCallbackHelper {
   // 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);
 };
 
@@ -177,5 +177,5 @@ TEST_F(NetworkFetcherTest, FetchFailed) {
 }
 
 }  // namespace
-}  // namespace fetcher
+}  // namespace shell
 }  // namespace mojo