Move fetchers into mojo/shell/fetcher

mojo/shell/fetcher/network_fetcher.cc

Index: mojo/shell/fetcher/network_fetcher.cc
diff --git a/mojo/fetcher/network_fetcher.cc b/mojo/shell/fetcher/network_fetcher.cc
similarity index 95%
rename from mojo/fetcher/network_fetcher.cc
rename to mojo/shell/fetcher/network_fetcher.cc
index 28280061371b12ef801f267270f62b277e0a18a1..e9e20c6895871c9d15753fc892a555174d273433 100644
--- a/mojo/fetcher/network_fetcher.cc
+++ b/mojo/shell/fetcher/network_fetcher.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>
 
@@ -31,7 +31,7 @@
 #include "mojo/shell/switches.h"
 
 namespace mojo {
-namespace fetcher {
+namespace shell {
 
 NetworkFetcher::NetworkFetcher(bool disable_cache,
                                mojo::URLRequestPtr request,
@@ -212,14 +212,13 @@ std::string NetworkFetcher::MimeType() {
 
 bool NetworkFetcher::HasMojoMagic() {
   std::string magic;
-  return shell::BlockingPeekNBytes(response_->body.get(), &magic,
-                                   strlen(kMojoMagic), kPeekTimeout) &&
-         magic == kMojoMagic;
+  return BlockingPeekNBytes(response_->body.get(), &magic, strlen(kMojoMagic),
+                            kPeekTimeout) && magic == kMojoMagic;
 }
 
 bool NetworkFetcher::PeekFirstLine(std::string* line) {
-  return shell::BlockingPeekLine(response_->body.get(), line, kMaxShebangLength,
-                                 kPeekTimeout);
+  return BlockingPeekLine(response_->body.get(), line, kMaxShebangLength,
+                          kPeekTimeout);
 }
 
 void NetworkFetcher::StartNetworkRequest(mojo::URLRequestPtr request,
@@ -250,5 +249,5 @@ void NetworkFetcher::OnLoadComplete(URLResponsePtr response) {
   loader_callback_.Run(std::move(owner));
 }
 
-}  // namespace fetcher
+}  // namespace shell
 }  // namespace mojo