Move fetchers into mojo/shell/fetcher

mojo/shell/fetcher/network_fetcher.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/bind.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "mojo/shell/data_pipe_peek.h"
 #include "mojo/shell/switches.h"
 
 namespace mojo {
-namespace fetcher {
+namespace shell {
 
 NetworkFetcher::NetworkFetcher(bool disable_cache,
                                mojo::URLRequestPtr request,
                                URLLoaderFactory* url_loader_factory,
                                const FetchCallback& loader_callback)
     : Fetcher(loader_callback),
       disable_cache_(false),
       url_(request->url.To<GURL>()),
       weak_ptr_factory_(this) {
   StartNetworkRequest(std::move(request), url_loader_factory);
@@ skipping 160 matching lines @@
                      base::Bind(&NetworkFetcher::CopyCompleted,
                                 weak_ptr_factory_.GetWeakPtr(), callback));
 }
 
 std::string NetworkFetcher::MimeType() {
   return response_->mime_type;
 }
 
 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,
                                          URLLoaderFactory* url_loader_factory) {
   TRACE_EVENT_ASYNC_BEGIN1("mojo_shell", "NetworkFetcher::NetworkRequest", this,
                            "url", request->url.To<std::string>());
   request->auto_follow_redirects = false;
   request->bypass_cache = disable_cache_;
 
   url_loader_factory->CreateURLLoader(GetProxy(&url_loader_));
@@ skipping 10 matching lines @@
                << response->error->description << ") while fetching "
                << response->url;
     loader_callback_.Run(nullptr);
     return;
   }
 
   response_ = std::move(response);
   loader_callback_.Run(std::move(owner));
 }
 
-}  // namespace fetcher
+}  // namespace shell
 }  // namespace mojo