Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/shell/url_resolver_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/url_resolver.h"
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ skipping 97 matching lines @@
   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("--args-for=https://a.org/foo --test"));
   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);
 }
@@ skipping 13 matching lines @@
   URLResolver resolver;
   resolver.SetMojoBaseURL(GURL("file:///base"));
   GURL mapped_url = resolver.ResolveMojoURL(GURL("mojo:foo?a=b"));
   EXPECT_EQ("file:///base/foo.mojo?a=b", mapped_url.spec());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo