Strip query string before applying url mapping.

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 "shell/url_resolver.h"
 
 #include "base/logging.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
@@ skipping 103 matching lines @@
   args.push_back("--map-origin=https://b.org=https://c.org/b");
   args.push_back("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, TestQueryForBaseURL) {
+  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