Fix URL duplication when SetArgsForURL is called mutliple times.

shell/application_manager/application_manager.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/application_manager/application_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 27 matching lines @@
                                      const std::vector<std::string>& v2) {
   if (!v1.size())
     return v2;
   if (!v2.size())
     return v1;
   std::vector<std::string> result(v1);
   result.insert(result.end(), v1.begin(), v1.end());
   return result;
 }
 
+void AppendArgsForURL(const GURL& url,
+                      const std::vector<std::string>& args,
+                      std::vector<std::string>* target) {
+  if (target->empty())
+    target->push_back(url.spec());
+  target->insert(target->end(), args.begin(), args.end());
+}
+
 }  // namespace
 
 class ApplicationManager::ContentHandlerConnection {
  public:
   ContentHandlerConnection(ApplicationManager* manager, Identity identity)
       : manager_(manager), identity_(identity) {
     ServiceProviderPtr services;
     manager->ConnectToApplication(identity_.url, GURL(),
                                   mojo::GetProxy(&services), nullptr,
                                   base::Closure());
@@ skipping 392 matching lines @@
 
 void ApplicationManager::SetLoaderForScheme(
     scoped_ptr<ApplicationLoader> loader,
     const std::string& scheme) {
   scheme_to_loader_[scheme] = loader.Pass();
 }
 
 void ApplicationManager::SetArgsForURL(const std::vector<std::string>& args,
                                        const GURL& url) {
   GURL base_url = GetBaseURLAndQuery(url, nullptr);
-  url_to_args_[base_url].insert(url_to_args_[base_url].end(), args.begin(),
-                                args.end());
+  AppendArgsForURL(base_url, args, &url_to_args_[base_url]);
   GURL mapped_url = delegate_->ResolveMappings(base_url);
   DCHECK(!mapped_url.has_query());
-  if (mapped_url != url) {
-    url_to_args_[mapped_url].insert(url_to_args_[mapped_url].end(),
-                                    args.begin(), args.end());
-  }
+  if (mapped_url != base_url)
+    AppendArgsForURL(mapped_url, args, &url_to_args_[mapped_url]);
   GURL resolved_url = delegate_->ResolveMojoURL(mapped_url);
   DCHECK(!resolved_url.has_query());
-  if (resolved_url != mapped_url) {
-    url_to_args_[resolved_url].insert(url_to_args_[resolved_url].end(),
-                                      args.begin(), args.end());
-  }
+  if (resolved_url != mapped_url)
+    AppendArgsForURL(resolved_url, args, &url_to_args_[resolved_url]);
 }
 
 NativeApplicationOptions* ApplicationManager::GetNativeApplicationOptionsForURL(
     const GURL& url) {
   DCHECK(!url.has_query());  // Precondition.
   // Apply mappings and resolution to get the resolved URL.
   GURL resolved_url =
       delegate_->ResolveMojoURL(delegate_->ResolveMappings(url));
   // TODO(vtl): We should probably also remove/disregard the query string (and
   // maybe canonicalize in other ways).
@@ skipping 49 matching lines @@
     return args_it->second;
   return std::vector<std::string>();
 }
 
 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
   native_runners_.erase(
       std::find(native_runners_.begin(), native_runners_.end(), runner));
 }
 
 }  // namespace shell