Move fetchers into mojo/shell/fetcher

mojo/shell/fetcher/about_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/about_fetcher.h"
+#include "mojo/shell/fetcher/about_fetcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace fetcher {
+namespace shell {
 namespace {
 
 class TestContentHandler : public ApplicationDelegate,
                            public InterfaceFactory<ContentHandler>,
                            public ContentHandler {
  public:
   TestContentHandler() : response_number_(0) {}
   ~TestContentHandler() override {}
 
   size_t response_number() const { return response_number_; }
@@ skipping 29 matching lines @@
     // that StartApplication() has been called.
   }
 
   size_t response_number_;
   URLResponsePtr latest_response_;
   WeakBindingSet<ContentHandler> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
-class TestLoader : public shell::ApplicationLoader {
+class TestLoader : public ApplicationLoader {
  public:
   explicit TestLoader(ApplicationDelegate* delegate) : delegate_(delegate) {}
   ~TestLoader() override {}
 
  private:
   // Overridden from ApplicationLoader:
   void Load(const GURL& url, InterfaceRequest<Application> request) override {
     app_.reset(new ApplicationImpl(delegate_, std::move(request)));
   }
 
@@ skipping 19 matching lines @@
     ServiceProviderPtr service_provider;
     InterfaceRequest<ServiceProvider> service_provider_request =
         GetProxy(&service_provider);
     // This connection error handler will be called when:
     // - TestContentHandler::StartApplication() has been called (please see
     //   comments in that method); or
     // - the application manager fails to fetch the requested URL.
     service_provider.set_connection_error_handler(
         [&run_loop]() { run_loop.Quit(); });
 
-    scoped_ptr<shell::ConnectToApplicationParams> params(
-        new shell::ConnectToApplicationParams);
+    scoped_ptr<ConnectToApplicationParams> params(
+        new ConnectToApplicationParams);
     params->SetTargetURL(GURL(url));
     params->set_services(std::move(service_provider_request));
     application_manager_->ConnectToApplication(std::move(params));
 
     run_loop.Run();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
-    scoped_ptr<shell::PackageManagerImpl> package_manager(
-      new shell::PackageManagerImpl(shell_dir, nullptr));
+    scoped_ptr<PackageManagerImpl> package_manager(
+      new PackageManagerImpl(shell_dir, nullptr));
     package_manager->RegisterContentHandler(
         "text/html", GURL("test:html_content_handler"));
     application_manager_.reset(
-        new shell::ApplicationManager(std::move(package_manager)));
+        new ApplicationManager(std::move(package_manager)));
     application_manager_->SetLoaderForURL(
         make_scoped_ptr(new TestLoader(&html_content_handler_)),
         GURL("test:html_content_handler"));
   }
 
   void TearDown() override { application_manager_.reset(); }
 
  private:
   base::ShadowingAtExitManager at_exit_;
   TestContentHandler html_content_handler_;
   base::MessageLoop loop_;
-  scoped_ptr<shell::ApplicationManager> application_manager_;
+  scoped_ptr<ApplicationManager> application_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutFetcherTest);
 };
 
 TEST_F(AboutFetcherTest, AboutBlank) {
   ConnectAndWait("about:blank");
 
   ASSERT_EQ(1u, html_content_handler()->response_number());
 
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:blank", response->url);
   EXPECT_EQ(200u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 TEST_F(AboutFetcherTest, UnrecognizedURL) {
   ConnectAndWait("about:some_unrecognized_url");
 
   ASSERT_EQ(1u, html_content_handler()->response_number());
 
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
-}  // namespace fetcher
+}  // namespace shell
 }  // namespace mojo