Strip query string before applying url mapping.

shell/application_manager/query_util.h

Index: shell/application_manager/query_util.h
diff --git a/shell/application_manager/query_util.h b/shell/application_manager/query_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..fa66ff860fd53216bc64376477c8fd2b370c7890
--- /dev/null
+++ b/shell/application_manager/query_util.h
@@ -0,0 +1,24 @@
+// Copyright 2015 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.
+
+#ifndef SHELL_APPLICATION_MANAGER_QUERY_UTIL_H_
+#define SHELL_APPLICATION_MANAGER_QUERY_UTIL_H_
+
+#include <utility>
+
+#include "url/gurl.h"
+
+namespace mojo {
+
+// Returns the |url| with the query string stripped.
+GURL StripQueryFromURL(const GURL& url);

[DaveMoore, 2015/03/04 14:57:07]

Instead of having two methods here why not just

GURL GetBaseURLAndQuery(const GURL& url, std::string* query)

where query can be NULL.

[qsr, 2015/03/04 15:02:05]

Mainly because I didn't want to have some nullptr in most call sites, as this
method is used a lot more than the other. WDYT?

+
+// Extract the query string from an URL and returns the base URL (without the
+// query string), and the query string. If the url doesn't have a query string,
+// it returns the url itself and an empty string.
+std::pair<GURL, std::string> GetBaseURLAndQuery(const GURL& url);
+
+}  // namespace mojo
+
+#endif  // SHELL_APPLICATION_MANAGER_QUERY_UTIL_H_