Move fetching logic out of ApplicationManager, eliminate url mappings.

mojo/shell/application_manager_unittest.cc

 // Copyright 2014 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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.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/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/shell/application_fetcher.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/fetcher.h"
 #include "mojo/shell/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
@@ skipping 420 matching lines @@
               InterfaceRequest<TestC> request) override {
     new TestCImpl(connection, context_, request.Pass());
   }
 
   TesterContext* context_;
   scoped_ptr<ApplicationImpl> app_;
   std::string requestor_url_;
   ScopedVector<TestAImpl> a_bindings_;
 };
 
-class TestDelegate : public ApplicationManager::Delegate {
+class TestApplicationFetcher : public ApplicationFetcher {
  public:
-  TestDelegate()
+  TestApplicationFetcher()
       : create_test_fetcher_(false),
         fetcher_url_("xxx"),
         mime_type_(kTestMimeType) {}
-  ~TestDelegate() override {}
-
-  void AddMapping(const GURL& from, const GURL& to) { mappings_[from] = to; }
+  ~TestApplicationFetcher() override {}
 
   void set_create_test_fetcher(bool create_test_fetcher) {
     create_test_fetcher_ = create_test_fetcher;
   }
 
   void set_fetcher_url(const GURL& url) { fetcher_url_ = url; }
 
   void set_mime_type(const std::string& mime_type) { mime_type_ = mime_type; }
 
   // ApplicationManager::Delegate
-  GURL ResolveMappings(const GURL& url) override {
-    auto it = mappings_.find(url);
-    if (it != mappings_.end())
-      return it->second;
-    return url;
-  }
-  GURL ResolveMojoURL(const GURL& url) override {
-    GURL mapped_url = ResolveMappings(url);
+  void SetApplicationManager(ApplicationManager* manager) override {}
+  GURL ResolveURL(const GURL& url) override {
+    GURL resolved_url = url;
     // The shell automatically map mojo URLs.
-    if (mapped_url.scheme() == "mojo") {
+    if (resolved_url.scheme() == "mojo") {
       url::Replacements<char> replacements;
       replacements.SetScheme("file", url::Component(0, 4));
-      mapped_url = mapped_url.ReplaceComponents(replacements);
+      resolved_url = resolved_url.ReplaceComponents(replacements);
     }
-    return mapped_url;
+    return resolved_url;
   }
-  bool CreateFetcher(const GURL& url,
-                     const Fetcher::FetchCallback& loader_callback) override {
-    if (!create_test_fetcher_)
-      return false;
-    new TestMimeTypeFetcher(loader_callback, fetcher_url_, mime_type_);
-    return true;
+  void FetchRequest(URLRequestPtr request,
+                    const Fetcher::FetchCallback& loader_callback) override {
+    if (create_test_fetcher_)
+      new TestMimeTypeFetcher(loader_callback, fetcher_url_, mime_type_);
   }
 
  private:
-  std::map<GURL, GURL> mappings_;
   bool create_test_fetcher_;
   GURL fetcher_url_;
   std::string mime_type_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestDelegate);
+  DISALLOW_COPY_AND_ASSIGN(TestApplicationFetcher);
 };
 
 class ApplicationManagerTest : public testing::Test {
  public:
   ApplicationManagerTest() : tester_context_(&loop_) {}
 
   ~ApplicationManagerTest() override {}
 
   void SetUp() override {
-    application_manager_.reset(new ApplicationManager(&test_delegate_));
+    application_manager_.reset(new ApplicationManager(
+        make_scoped_ptr(new TestApplicationFetcher)));
     test_loader_ = new TestApplicationLoader;
     test_loader_->set_context(&context_);
     application_manager_->set_default_loader(
         scoped_ptr<ApplicationLoader>(test_loader_));
 
     TestServicePtr service_proxy;
     application_manager_->ConnectToService(GURL(kTestURLString),
                                            &service_proxy);
     test_client_.reset(new TestClient(service_proxy.Pass()));
   }
 
   void TearDown() override {
     test_client_.reset();
     application_manager_.reset();
   }
 
   void AddLoaderForURL(const GURL& url, const std::string& requestor_url) {
     application_manager_->SetLoaderForURL(
         make_scoped_ptr(new Tester(&tester_context_, requestor_url)), url);
   }
 
   bool HasRunningInstanceForURL(const GURL& url) {
     ApplicationManager::TestAPI manager_test_api(application_manager_.get());
     return manager_test_api.HasRunningInstanceForURL(url);
   }
 
  protected:
   base::ShadowingAtExitManager at_exit_;
-  TestDelegate test_delegate_;
   TestApplicationLoader* test_loader_;
   TesterContext tester_context_;
   TestContext context_;
   base::MessageLoop loop_;
   scoped_ptr<TestClient> test_client_;
   scoped_ptr<ApplicationManager> application_manager_;
   DISALLOW_COPY_AND_ASSIGN(ApplicationManagerTest);
 };
 
 TEST_F(ApplicationManagerTest, Basic) {
   test_client_->Test("test");
   loop_.Run();
   EXPECT_EQ(std::string("test"), context_.last_test_string);
 }
 
-// Confirm that url mappings are respected.
-TEST_F(ApplicationManagerTest, URLMapping) {
-  ApplicationManager am(&test_delegate_);
-  GURL test_url("test:test");
-  GURL test_url2("test:test2");
-  test_delegate_.AddMapping(test_url, test_url2);
-  TestApplicationLoader* loader = new TestApplicationLoader;
-  loader->set_context(&context_);
-  am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader), test_url2);
-  {
-    // Connect to the mapped url
-    TestServicePtr test_service;
-    am.ConnectToService(test_url, &test_service);
-    TestClient test_client(test_service.Pass());
-    test_client.Test("test");
-    loop_.Run();
-  }
-  {
-    // Connect to the target url
-    TestServicePtr test_service;
-    am.ConnectToService(test_url2, &test_service);
-    TestClient test_client(test_service.Pass());
-    test_client.Test("test");
-    loop_.Run();
-  }
-}
-
 TEST_F(ApplicationManagerTest, ClientError) {
   test_client_->Test("test");
   EXPECT_TRUE(HasRunningInstanceForURL(GURL(kTestURLString)));
   loop_.Run();
   EXPECT_EQ(1, context_.num_impls);
   test_client_.reset();
   loop_.Run();
   EXPECT_EQ(0, context_.num_impls);
   EXPECT_TRUE(HasRunningInstanceForURL(GURL(kTestURLString)));
 }
 
 TEST_F(ApplicationManagerTest, Deletes) {
   {
-    ApplicationManager am(&test_delegate_);
+    ApplicationManager am(make_scoped_ptr(new TestApplicationFetcher));
     TestApplicationLoader* default_loader = new TestApplicationLoader;
     default_loader->set_context(&context_);
     TestApplicationLoader* url_loader1 = new TestApplicationLoader;
     TestApplicationLoader* url_loader2 = new TestApplicationLoader;
     url_loader1->set_context(&context_);
     url_loader2->set_context(&context_);
     TestApplicationLoader* scheme_loader1 = new TestApplicationLoader;
     TestApplicationLoader* scheme_loader2 = new TestApplicationLoader;
     scheme_loader1->set_context(&context_);
     scheme_loader2->set_context(&context_);
@@ skipping 123 matching lines @@
   // ApplicationManager, so this cannot succeed (but also shouldn't crash).
   TestCPtr c;
   application_manager_->ConnectToService(GURL(kTestAURLString), &c);
   c.set_connection_error_handler(
       []() { base::MessageLoop::current()->QuitWhenIdle(); });
 
   loop_.Run();
   EXPECT_TRUE(c.encountered_error());
 }
 
-TEST_F(ApplicationManagerTest, MappedURLsShouldNotCauseDuplicateLoad) {
-  test_delegate_.AddMapping(GURL("foo:foo2"), GURL("foo:foo"));
-  // 1 because ApplicationManagerTest connects once at startup.
-  EXPECT_EQ(1, test_loader_->num_loads());
-
-  TestServicePtr test_service;
-  application_manager_->ConnectToService(GURL("foo:foo"), &test_service);
-  EXPECT_EQ(2, test_loader_->num_loads());
-
-  TestServicePtr test_service2;
-  application_manager_->ConnectToService(GURL("foo:foo2"), &test_service2);
-  EXPECT_EQ(2, test_loader_->num_loads());
-
-  TestServicePtr test_service3;
-  application_manager_->ConnectToService(GURL("bar:bar"), &test_service2);
-  EXPECT_EQ(3, test_loader_->num_loads());
-}
-
-TEST_F(ApplicationManagerTest, MappedURLsShouldWorkWithLoaders) {
-  TestApplicationLoader* custom_loader = new TestApplicationLoader;
-  TestContext context;
-  custom_loader->set_context(&context);
-  application_manager_->SetLoaderForURL(make_scoped_ptr(custom_loader),
-                                        GURL("mojo:foo"));
-  test_delegate_.AddMapping(GURL("mojo:foo2"), GURL("mojo:foo"));
-
-  TestServicePtr test_service;
-  application_manager_->ConnectToService(GURL("mojo:foo2"), &test_service);
-  EXPECT_EQ(1, custom_loader->num_loads());
-  custom_loader->set_context(nullptr);
-
-  EXPECT_TRUE(HasRunningInstanceForURL(GURL("mojo:foo2")));
-  EXPECT_FALSE(HasRunningInstanceForURL(GURL("mojo:foo")));
-}
-
 TEST_F(ApplicationManagerTest, TestQueryWithLoaders) {
   TestApplicationLoader* url_loader = new TestApplicationLoader;
   TestApplicationLoader* scheme_loader = new TestApplicationLoader;
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(url_loader), GURL("test:test1"));
   application_manager_->SetLoaderForScheme(
       scoped_ptr<ApplicationLoader>(scheme_loader), "test");
 
   // test::test1 should go to url_loader.
   TestServicePtr test_service;
@@ skipping 23 matching lines @@
   application_manager_->ConnectToApplication(params.Pass());
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 TEST(ApplicationManagerTest2, ContentHandlerConnectionGetsRequestorURL) {
   const GURL content_handler_url("http://test.content.handler");
   const GURL requestor_url("http://requestor.url");
   TestContext test_context;
   base::MessageLoop loop;
-  TestDelegate test_delegate;
-  test_delegate.set_create_test_fetcher(true);
-  ApplicationManager application_manager(&test_delegate);
+  scoped_ptr<TestApplicationFetcher> test_application_fetcher(
+      new TestApplicationFetcher);
+  test_application_fetcher->set_create_test_fetcher(true);
+  ApplicationManager application_manager(test_application_fetcher.Pass());
   application_manager.set_default_loader(nullptr);
   application_manager.RegisterContentHandler(kTestMimeType,
                                              content_handler_url);
 
   TestApplicationLoader* loader = new TestApplicationLoader;
   loader->set_context(&test_context);
   application_manager.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader),
                                       content_handler_url);
 
   bool called = false;
@@ skipping 42 matching lines @@
       GURL("http://www.another_domain.org/abc"), &test_service);
   EXPECT_EQ(4, test_loader_->num_loads());
 }
 
 TEST(ApplicationManagerTest2,
      MultipleConnectionsToContentHandlerGetSameContentHandlerId) {
   base::MessageLoop loop;
   const GURL content_handler_url("http://test.content.handler");
   const GURL requestor_url("http://requestor.url");
   TestContext test_context;
-  TestDelegate test_delegate;
-  test_delegate.set_fetcher_url(GURL("test:test"));
-  test_delegate.set_create_test_fetcher(true);
-  ApplicationManager application_manager(&test_delegate);
+  scoped_ptr<TestApplicationFetcher> test_application_fetcher(
+      new TestApplicationFetcher);
+  test_application_fetcher->set_fetcher_url(GURL("test:test"));
+  test_application_fetcher->set_create_test_fetcher(true);
+  ApplicationManager application_manager(test_application_fetcher.Pass());
   application_manager.set_default_loader(nullptr);
   application_manager.RegisterContentHandler(kTestMimeType,
                                              content_handler_url);
 
   TestApplicationLoader* content_handler_loader = new TestApplicationLoader;
   content_handler_loader->set_create_content_handler(true);
   content_handler_loader->set_context(&test_context);
   application_manager.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader),
       content_handler_url);
@@ skipping 34 matching lines @@
     EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id2);
   }
   EXPECT_EQ(content_handler_id, content_handler_id2);
 }
 
 TEST(ApplicationManagerTest2, DifferedContentHandlersGetDifferentIDs) {
   base::MessageLoop loop;
   const GURL content_handler_url("http://test.content.handler");
   const GURL requestor_url("http://requestor.url");
   TestContext test_context;
-  TestDelegate test_delegate;
-  test_delegate.set_fetcher_url(GURL("test:test"));
-  test_delegate.set_create_test_fetcher(true);
-  ApplicationManager application_manager(&test_delegate);
+  TestApplicationFetcher* test_application_fetcher = new TestApplicationFetcher;
+  test_application_fetcher->set_fetcher_url(GURL("test:test"));
+  test_application_fetcher->set_create_test_fetcher(true);
+  ApplicationManager application_manager(
+      make_scoped_ptr(test_application_fetcher));
   application_manager.set_default_loader(nullptr);
   application_manager.RegisterContentHandler(kTestMimeType,
                                              content_handler_url);
 
   TestApplicationLoader* content_handler_loader = new TestApplicationLoader;
   content_handler_loader->set_create_content_handler(true);
   content_handler_loader->set_context(&test_context);
   application_manager.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader),
       content_handler_url);
@@ skipping 11 matching lines @@
       content_handler_id = t;
       run_loop.Quit();
     });
     application_manager.ConnectToApplication(params.Pass());
     run_loop.Run();
     EXPECT_NE(Shell::kInvalidContentHandlerID, content_handler_id);
   }
 
   const std::string mime_type2("test/mime-type2");
   const GURL content_handler_url2("http://test.content2.handler");
-  test_delegate.set_fetcher_url(GURL("test2:test2"));
-  test_delegate.set_mime_type(mime_type2);
+  test_application_fetcher->set_fetcher_url(GURL("test2:test2"));
+  test_application_fetcher->set_mime_type(mime_type2);
   application_manager.RegisterContentHandler(mime_type2, content_handler_url2);
 
   TestApplicationLoader* content_handler_loader2 = new TestApplicationLoader;
   content_handler_loader->set_create_content_handler(true);
   content_handler_loader->set_context(&test_context);
   application_manager.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader2),
       content_handler_url2);
 
   uint32_t content_handler_id2;
@@ skipping 27 matching lines @@
   params->set_filter(GetPermissiveCapabilityFilter());
   params->set_connect_callback(
       [&content_handler_id](uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(params.Pass());
   EXPECT_EQ(0u, content_handler_id);
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo