Move fetching logic out of ApplicationManager, eliminate url mappings.

mojo/runner/url_resolver_unittest.cc

Index: mojo/runner/url_resolver_unittest.cc
diff --git a/mojo/runner/url_resolver_unittest.cc b/mojo/runner/url_resolver_unittest.cc
deleted file mode 100644
index f9396573d7a21b9cd9e206505f9e1ec6e3b4c8aa..0000000000000000000000000000000000000000
--- a/mojo/runner/url_resolver_unittest.cc
+++ /dev/null
@@ -1,160 +0,0 @@
-// 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/runner/url_resolver.h"
-
-#include "base/files/file_util.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/logging.h"
-#include "mojo/util/filename_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace mojo {
-namespace runner {
-namespace test {
-namespace {
-
-typedef testing::Test URLResolverTest;
-
-TEST_F(URLResolverTest, MojoURLsFallThrough) {
-  URLResolver resolver;
-  resolver.AddURLMapping(GURL("mojo:test"), GURL("mojo:foo"));
-  const GURL base_url("file:/base");
-  resolver.SetMojoBaseURL(base_url);
-  GURL mapped_url = resolver.ApplyMappings(GURL("mojo:test"));
-  std::string resolved(resolver.ResolveMojoURL(mapped_url).spec());
-  // Resolved must start with |base_url|.
-  EXPECT_EQ(base_url.spec(), resolved.substr(0, base_url.spec().size()));
-  // And must contain foo.
-  EXPECT_NE(std::string::npos, resolved.find("foo"));
-}
-
-TEST_F(URLResolverTest, MapURL) {
-  URLResolver resolver;
-  resolver.AddURLMapping(GURL("https://domokit.org/test.mojo"),
-                         GURL("file:///mojo/src/out/Debug/test.mojo"));
-  GURL mapped_url =
-      resolver.ApplyMappings(GURL("https://domokit.org/test.mojo"));
-  EXPECT_EQ("file:///mojo/src/out/Debug/test.mojo", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, MultipleMapURL) {
-  URLResolver resolver;
-  resolver.AddURLMapping(GURL("https://a.org/foo"),
-                         GURL("https://b.org/a/foo"));
-  resolver.AddURLMapping(GURL("https://b.org/a/foo"),
-                         GURL("https://c.org/b/a/foo"));
-  GURL mapped_url = resolver.ApplyMappings(GURL("https://a.org/foo"));
-  EXPECT_EQ("https://c.org/b/a/foo", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, MapOrigin) {
-  URLResolver resolver;
-  resolver.AddOriginMapping(GURL("https://domokit.org"),
-                            GURL("file:///mojo/src/out/Debug"));
-  GURL mapped_url =
-      resolver.ApplyMappings(GURL("https://domokit.org/test.mojo"));
-  EXPECT_EQ("file:///mojo/src/out/Debug/test.mojo", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, MultipleMapOrigin) {
-  URLResolver resolver;
-  resolver.AddOriginMapping(GURL("https://a.org"), GURL("https://b.org/a"));
-  resolver.AddOriginMapping(GURL("https://b.org"), GURL("https://c.org/b"));
-  GURL mapped_url = resolver.ApplyMappings(GURL("https://a.org/foo"));
-  EXPECT_EQ("https://c.org/b/a/foo", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, MapOriginThenURL) {
-  URLResolver resolver;
-  resolver.AddOriginMapping(GURL("https://a.org"), GURL("https://b.org/a"));
-  resolver.AddURLMapping(GURL("https://b.org/a/foo"),
-                         GURL("https://c.org/b/a/foo"));
-  GURL mapped_url = resolver.ApplyMappings(GURL("https://a.org/foo"));
-  EXPECT_EQ("https://c.org/b/a/foo", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, MapURLThenOrigin) {
-  URLResolver resolver;
-  resolver.AddURLMapping(GURL("https://a.org/foo"),
-                         GURL("https://b.org/a/foo"));
-  resolver.AddOriginMapping(GURL("https://b.org"), GURL("https://c.org/b"));
-  GURL mapped_url = resolver.ApplyMappings(GURL("https://a.org/foo"));
-  EXPECT_EQ("https://c.org/b/a/foo", mapped_url.spec());
-}
-
-#if defined(OS_POSIX)
-#define ARG_LITERAL(x) x
-#elif defined(OS_WIN)
-#define ARG_LITERAL(x) L ## x
-#endif
-
-TEST_F(URLResolverTest, GetOriginMappings) {
-  base::CommandLine::StringVector args;
-  args.push_back(ARG_LITERAL("--map-origin=https://a.org=https://b.org/a"));
-  std::vector<URLResolver::OriginMapping> mappings =
-      URLResolver::GetOriginMappings(args);
-  ASSERT_EQ(1U, mappings.size());
-  EXPECT_EQ("https://a.org", mappings[0].origin);
-  EXPECT_EQ("https://b.org/a", mappings[0].base_url);
-
-  args.clear();
-  args.push_back(ARG_LITERAL("-map-origin=https://a.org=https://b.org/a"));
-  mappings = URLResolver::GetOriginMappings(args);
-  ASSERT_EQ(1U, mappings.size());
-  EXPECT_EQ("https://a.org", mappings[0].origin);
-  EXPECT_EQ("https://b.org/a", mappings[0].base_url);
-
-  args.clear();
-  args.push_back(ARG_LITERAL("--map-origin"));
-  mappings = URLResolver::GetOriginMappings(args);
-  EXPECT_EQ(0U, mappings.size());
-
-  args.clear();
-  args.push_back(ARG_LITERAL("--map-origin="));
-  mappings = URLResolver::GetOriginMappings(args);
-  EXPECT_EQ(0U, mappings.size());
-
-  args.clear();
-  args.push_back(ARG_LITERAL("mojo_shell"));
-  args.push_back(ARG_LITERAL("--map-origin=https://a.org=https://b.org/a"));
-  args.push_back(ARG_LITERAL("--map-origin=https://b.org=https://c.org/b"));
-  args.push_back(ARG_LITERAL("https://a.org/foo"));
-  mappings = URLResolver::GetOriginMappings(args);
-  ASSERT_EQ(2U, mappings.size());
-  EXPECT_EQ("https://a.org", mappings[0].origin);
-  EXPECT_EQ("https://b.org/a", mappings[0].base_url);
-  EXPECT_EQ("https://b.org", mappings[1].origin);
-  EXPECT_EQ("https://c.org/b", mappings[1].base_url);
-}
-
-TEST_F(URLResolverTest, TestQueryForURLMapping) {
-  URLResolver resolver;
-  resolver.SetMojoBaseURL(GURL("file:/base"));
-  resolver.AddURLMapping(GURL("https://a.org/foo"),
-                         GURL("https://b.org/a/foo"));
-  resolver.AddURLMapping(GURL("https://b.org/a/foo"),
-                         GURL("https://c.org/b/a/foo"));
-  GURL mapped_url = resolver.ApplyMappings(GURL("https://a.org/foo?a=b"));
-  EXPECT_EQ("https://c.org/b/a/foo?a=b", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, TestQueryForBaseFileURL) {
-  URLResolver resolver;
-  resolver.SetMojoBaseURL(GURL("file:///base"));
-  GURL mapped_url = resolver.ResolveMojoURL(GURL("mojo:foo?a=b"));
-  EXPECT_EQ("file:///base/foo/foo.mojo?a=b", mapped_url.spec());
-}
-
-TEST_F(URLResolverTest, TestQueryForBaseHttpURL) {
-  URLResolver resolver;
-  resolver.SetMojoBaseURL(GURL("http://127.0.0.1:1234"));
-  GURL mapped_url = resolver.ResolveMojoURL(GURL("mojo:foo?a=b"));
-  EXPECT_EQ("http://127.0.0.1:1234/foo/foo.mojo?a=b", mapped_url.spec());
-}
-
-}  // namespace
-}  // namespace test
-}  // namespace runner
-}  // namespace mojo