Fix URL duplication when SetArgsForURL is called mutliple times.

shell/application_manager/application_manager_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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 504 matching lines @@
   am.SetArgsForURL(args, test_url);
   TestApplicationLoader* loader = new TestApplicationLoader;
   loader->set_context(&context_);
   am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader), test_url);
   TestServicePtr test_service;
   am.ConnectToService(test_url, &test_service);
   TestClient test_client(test_service.Pass());
   test_client.Test("test");
   loop_.Run();
   std::vector<std::string> app_args = loader->GetArgs();
-  ASSERT_EQ(args.size(), app_args.size());
-  EXPECT_EQ(args[0], app_args[0]);
-  EXPECT_EQ(args[1], app_args[1]);
+  ASSERT_EQ(args.size() + 1, app_args.size());
+  EXPECT_EQ(args[0], app_args[1]);
+  EXPECT_EQ(args[1], app_args[2]);
 }
 
 // Confirm that arguments are sent to an application in the presence of query
 // parameters.
 TEST_F(ApplicationManagerTest, ArgsWithQuery) {
   ApplicationManager am(ApplicationManager::Options(), &test_delegate_);
   GURL test_url("test:test");
   GURL test_url_with_query("test:test?foo=bar");
   std::vector<std::string> args;
   args.push_back("test_arg1");
   am.SetArgsForURL(args, test_url);
   TestApplicationLoader* loader = new TestApplicationLoader;
   loader->set_context(&context_);
   am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader), test_url);
   TestServicePtr test_service;
   am.ConnectToService(test_url_with_query, &test_service);
   TestClient test_client(test_service.Pass());
   test_client.Test("test");
   loop_.Run();
   std::vector<std::string> app_args = loader->GetArgs();
-  ASSERT_EQ(args.size(), app_args.size());
-  EXPECT_EQ(args[0], app_args[0]);
+  ASSERT_EQ(args.size() + 1, app_args.size());
+  EXPECT_EQ(args[0], app_args[1]);
+}
+
+// Confirm that the URL is not duplicated when arguments are added in multiple
+// phase.

[ppi, 2015/11/23 15:02:44]

phases

[qsr, 2015/11/23 17:18:00]

Done.

+TEST_F(ApplicationManagerTest, ArgsMultipleCalls) {
+  ApplicationManager am(ApplicationManager::Options(), &test_delegate_);
+  GURL test_url("test:test");
+  std::vector<std::string> args1;
+  args1.push_back("test_arg1");
+  am.SetArgsForURL(args1, test_url);
+  std::vector<std::string> args2;
+  args2.push_back("test_arg2");
+  am.SetArgsForURL(args2, test_url);
+  TestApplicationLoader* loader = new TestApplicationLoader;
+  loader->set_context(&context_);
+  am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader), test_url);
+  TestServicePtr test_service;
+  am.ConnectToService(test_url, &test_service);
+  TestClient test_client(test_service.Pass());
+  test_client.Test("test");
+  loop_.Run();
+  std::vector<std::string> app_args = loader->GetArgs();
+  ASSERT_EQ(args1.size() + args2.size() + 1, app_args.size());
+  EXPECT_EQ(args1[0], app_args[1]);
+  EXPECT_EQ(args2[0], app_args[2]);
 }
 
 // Confirm that arguments are aggregated through mappings.
 TEST_F(ApplicationManagerTest, ArgsAndMapping) {
   ApplicationManager am(ApplicationManager::Options(), &test_delegate_);
   GURL test_url("test:test");
   GURL test_url2("test:test2");
   test_delegate_.AddMapping(test_url, test_url2);
   std::vector<std::string> args;
   args.push_back("test_arg1");
   args.push_back("test_arg2");
   am.SetArgsForURL(args, test_url);
   std::vector<std::string> args2;
   args2.push_back("test_arg3");
   args2.push_back("test_arg4");
   am.SetArgsForURL(args2, test_url2);
   TestApplicationLoader* loader = new TestApplicationLoader;
   loader->set_context(&context_);
   am.SetLoaderForURL(scoped_ptr<ApplicationLoader>(loader), test_url2);
   {
     // Connext to the mapped url
     TestServicePtr test_service;
     am.ConnectToService(test_url, &test_service);
     TestClient test_client(test_service.Pass());
     test_client.Test("test");
     loop_.Run();
     std::vector<std::string> app_args = loader->GetArgs();
-    ASSERT_EQ(args.size() + args2.size(), app_args.size());
-    EXPECT_EQ(args[0], app_args[0]);
-    EXPECT_EQ(args[1], app_args[1]);
-    EXPECT_EQ(args2[0], app_args[2]);
-    EXPECT_EQ(args2[1], app_args[3]);
+    ASSERT_EQ(args.size() + args2.size() + 1, app_args.size());
+    EXPECT_EQ(args[0], app_args[1]);
+    EXPECT_EQ(args[1], app_args[2]);
+    EXPECT_EQ(args2[0], app_args[3]);
+    EXPECT_EQ(args2[1], app_args[4]);
   }
   {
     // Connext to the target url
     TestServicePtr test_service;
     am.ConnectToService(test_url2, &test_service);
     TestClient test_client(test_service.Pass());
     test_client.Test("test");
     loop_.Run();
     std::vector<std::string> app_args = loader->GetArgs();
-    ASSERT_EQ(args.size() + args2.size(), app_args.size());
-    EXPECT_EQ(args[0], app_args[0]);
-    EXPECT_EQ(args[1], app_args[1]);
-    EXPECT_EQ(args2[0], app_args[2]);
-    EXPECT_EQ(args2[1], app_args[3]);
+    ASSERT_EQ(args.size() + args2.size() + 1, app_args.size());
+    EXPECT_EQ(args[0], app_args[1]);
+    EXPECT_EQ(args[1], app_args[2]);
+    EXPECT_EQ(args2[0], app_args[3]);
+    EXPECT_EQ(args2[1], app_args[4]);
   }
 }
 
 TEST_F(ApplicationManagerTest, ClientError) {
   test_client_->Test("test");
   EXPECT_TRUE(HasFactoryForTestURL());
   loop_.Run();
   EXPECT_EQ(1, context_.num_impls);
   test_client_.reset();
   loop_.Run();
@@ skipping 209 matching lines @@
   bool called = false;
   application_manager_->ConnectToApplication(
       GURL("test:test"), GURL(), nullptr, nullptr,
       base::Bind(&QuitClosure, base::Unretained(&called)));
   loop_.Run();
   EXPECT_TRUE(called);
 }
 
 }  // namespace
 }  // namespace shell