Remove the old package manager

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 "mojo/shell/application_manager.h"
 
 #include <utility>
 
 #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/public/cpp/bindings/strong_binding.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/connect_util.h"
-#include "mojo/shell/fetcher.h"
-#include "mojo/shell/package_manager.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "mojo/shell/test.mojom.h"
-#include "mojo/shell/test_package_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 
 const char kTestURLString[] = "test:testService";
 const char kTestAURLString[] = "test:TestA";
 const char kTestBURLString[] = "test:TestB";
 
@@ skipping 351 matching lines @@
   ScopedVector<TestAImpl> a_bindings_;
 };
 
 class ApplicationManagerTest : public testing::Test {
  public:
   ApplicationManagerTest() : tester_context_(&loop_) {}
 
   ~ApplicationManagerTest() override {}
 
   void SetUp() override {
-    application_manager_.reset(new ApplicationManager(
-        make_scoped_ptr(new TestPackageManager), true));
+    application_manager_.reset(new ApplicationManager(true));
     test_loader_ = new TestApplicationLoader;
     test_loader_->set_context(&context_);
     application_manager_->set_default_loader(
         scoped_ptr<ApplicationLoader>(test_loader_));
 
     TestServicePtr service_proxy;
     ConnectToInterface(application_manager_.get(), GURL(kTestURLString),
                      &service_proxy);
     test_client_.reset(new TestClient(std::move(service_proxy)));
   }
@@ skipping 36 matching lines @@
   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(make_scoped_ptr(new TestPackageManager), true);
+    ApplicationManager am(true);
     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_);
     am.set_default_loader(scoped_ptr<ApplicationLoader>(default_loader));
     am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(url_loader1),
                        GURL("test:test1"));
     am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(url_loader2),
@@ skipping 127 matching lines @@
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 TEST_F(ApplicationManagerTest, SameIdentityShouldNotCauseDuplicateLoad) {
   // 1 because ApplicationManagerTest connects once at startup.
   EXPECT_EQ(1, test_loader_->num_loads());
 
   TestServicePtr test_service;
   ConnectToInterface(application_manager_.get(),
-                     GURL("http://www.example.org/abc?def"), &test_service);
+                     GURL("mojo:foo"), &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
   // Exactly the same URL as above.
   ConnectToInterface(application_manager_.get(),
-                     GURL("http://www.example.org/abc?def"), &test_service);
+                     GURL("mojo:foo"), &test_service);
   EXPECT_EQ(2, test_loader_->num_loads());
 
-  // The same identity as the one above because only the query string is
-  // different.
-  ConnectToInterface(application_manager_.get(),
-                     GURL("http://www.example.org/abc"), &test_service);
-  EXPECT_EQ(2, test_loader_->num_loads());
-
-  // A different identity because the path is different.
-  ConnectToInterface(application_manager_.get(),
-                     GURL("http://www.example.org/another_path"), &test_service);
-  EXPECT_EQ(3, test_loader_->num_loads());
-
   // A different identity because the domain is different.
   ConnectToInterface(application_manager_.get(),
-                     GURL("http://www.another_domain.org/abc"), &test_service);
-  EXPECT_EQ(4, test_loader_->num_loads());
+                     GURL("mojo:bar"), &test_service);
+  EXPECT_EQ(3, test_loader_->num_loads());
 }
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo