Enable Multiple URLs for Open URLs In Chrome Siri Shortcut

Change the existing Open URLs in Chrome Siri shortcut so that instead of
only one URL, it can now accept multiple URLs. Also refactored the code
for creating the std::vector of URLs to avoid duplication of code with
Open URLs In Chrome Incognito.

Bug: 1114012
Change-Id: I22896c3cf1b05c78d5838793c01d2e1bb0b1e211
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342207
Commit-Queue: Andy Lu <andyhylu@google.com>
Reviewed-by: Mark Cogan <marq@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796929}

ios/chrome/app/application_delegate/user_activity_handler.mm

@@ -61,6 +61,14 @@ NSString* const kSiriShortcutOpenInChrome = @"OpenInChromeIntent";
 NSString* const kSiriShortcutSearchInChrome = @"SearchInChromeIntent";
 NSString* const kSiriShortcutOpenInIncognito = @"OpenInChromeIncognitoIntent";
 
+std::vector<GURL> createGURLVectorFromIntentURLs(NSArray<NSURL*>* intentURLs) {
+  std::vector<GURL> URLs;
+  for (NSURL* URL in intentURLs) {
+    URLs.push_back(net::GURLWithNSURL(URL));
+  }
+  return URLs;
+}
+
 }  // namespace
 
 @interface UserActivityHandler ()
@@ -176,18 +184,23 @@ NSString* const kSiriShortcutOpenInIncognito = @"OpenInChromeIncognitoIntent";
     base::RecordAction(UserMetricsAction("IOSLaunchedByOpenInChromeIntent"));
     OpenInChromeIntent* intent = base::mac::ObjCCastStrict<OpenInChromeIntent>(
         userActivity.interaction.intent);
-    if (!intent.url)
-      return NO;
 
-    GURL webpageGURL(net::GURLWithNSURL(intent.url));
-    if (!webpageGURL.is_valid())
+    if (!intent.url || intent.url.count == 0) {
       return NO;
+    }
 
+    std::vector<GURL> URLs = createGURLVectorFromIntentURLs(intent.url);
     AppStartupParameters* startupParams =
-        [[AppStartupParameters alloc] initWithExternalURL:webpageGURL
-                                              completeURL:webpageGURL];
+        [[AppStartupParameters alloc] initWithURLs:URLs];
+
     [connectionInformation setStartupParameters:startupParams];
-    webpageURL = intent.url;
+    return [self continueUserActivityURLs:URLs
+                      applicationIsActive:applicationIsActive
+                                tabOpener:tabOpener
+                    connectionInformation:connectionInformation
+                       startupInformation:startupInformation
+                                Incognito:NO];
+
   } else if ([userActivity.activityType
                  isEqualToString:kSiriShortcutOpenInIncognito]) {
     base::RecordAction(UserMetricsAction("IOSLaunchedByOpenInIncognitoIntent"));
@@ -199,13 +212,11 @@ NSString* const kSiriShortcutOpenInIncognito = @"OpenInChromeIncognitoIntent";
       return NO;
     }
 
-    std::vector<GURL> URLs;
-    for (NSURL* URL in intent.urls) {
-      URLs.push_back(net::GURLWithNSURL(URL));
-    }
+    std::vector<GURL> URLs = createGURLVectorFromIntentURLs(intent.urls);
 
     AppStartupParameters* startupParams =
         [[AppStartupParameters alloc] initWithURLs:URLs];
+
     startupParams.launchInIncognito = YES;
     [connectionInformation setStartupParameters:startupParams];
     return [self continueUserActivityURLs:URLs

ios/chrome/app/application_delegate/user_activity_handler_unittest.mm

@@ -515,8 +515,13 @@ TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentBackground) {
   NSUserActivity* userActivity =
       [[NSUserActivity alloc] initWithActivityType:@"OpenInChromeIntent"];
   OpenInChromeIntent* intent = [[OpenInChromeIntent alloc] init];
-  NSURL* nsurl = [NSURL URLWithString:@"http://www.google.com"];
-  intent.url = nsurl;
+
+  NSURL* url1 = [[NSURL alloc] initWithString:@"http://www.google.com"];
+  NSURL* url2 = [[NSURL alloc] initWithString:@"http://www.apple.com"];
+  NSURL* url3 = [[NSURL alloc] initWithString:@"http://www.espn.com"];
+  NSArray<NSURL*>* urls = [NSArray arrayWithObjects:url1, url2, url3, nil];
+
+  intent.url = urls;
   INInteraction* interaction = [[INInteraction alloc] initWithIntent:intent
                                                             response:nil];
   userActivity.interaction = interaction;
@@ -525,13 +530,21 @@ TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentBackground) {
       [OCMockObject niceMockForProtocol:@protocol(StartupInformation)];
   id connectionInformationMock =
       [OCMockObject niceMockForProtocol:@protocol(ConnectionInformation)];
+
   [[connectionInformationMock expect]
       setStartupParameters:[OCMArg checkWithBlock:^BOOL(id value) {
-        EXPECT_TRUE([value isKindOfClass:[AppStartupParameters class]]);
+        EXPECT_TRUE([value isKindOfClass:[AppStartupParameters class]] ||
+                    value == nil);
 
-        AppStartupParameters* startupParameters = (AppStartupParameters*)value;
-        const GURL calledURL = startupParameters.externalURL;
-        return calledURL == net::GURLWithNSURL(nsurl);
+        if (value != nil) {
+          AppStartupParameters* startupParameters =
+              (AppStartupParameters*)value;
+          const GURL calledURL = startupParameters.externalURL;
+          EXPECT_TRUE((int)[intent.url count] == 3);
+          return [intent.url containsObject:(net::NSURLWithGURL(calledURL))];
+        } else {
+          return YES;
+        }
       }]];
 
   // The test will fail if a method of this object is called.
@@ -617,15 +630,20 @@ TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentIncognitoForeground) {
   // Test.
   EXPECT_OCMOCK_VERIFY(startupInformationMock);
   EXPECT_TRUE(result);
+  EXPECT_EQ(3U, tabOpener.URLs.size());
 }
 
 // Tests that Chrome responds to open intents in the foreground.
 TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentForeground) {
-  GURL gurl("http://www.google.com");
   NSUserActivity* userActivity =
       [[NSUserActivity alloc] initWithActivityType:@"OpenInChromeIntent"];
   OpenInChromeIntent* intent = [[OpenInChromeIntent alloc] init];
-  intent.url = net::NSURLWithGURL(gurl);
+  NSURL* url1 = [[NSURL alloc] initWithString:@"http://www.google.com"];
+  NSURL* url2 = [[NSURL alloc] initWithString:@"http://www.apple.com"];
+  NSURL* url3 = [[NSURL alloc] initWithString:@"http://www.espn.com"];
+  NSArray<NSURL*>* urls = [NSArray arrayWithObjects:url1, url2, url3, nil];
+
+  intent.url = urls;
   INInteraction* interaction = [[INInteraction alloc] initWithIntent:intent
                                                             response:nil];
   userActivity.interaction = interaction;
@@ -636,19 +654,32 @@ TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentForeground) {
 
   id connectionInformationMock =
       [OCMockObject niceMockForProtocol:@protocol(ConnectionInformation)];
+
   [[connectionInformationMock expect]
       setStartupParameters:[OCMArg checkWithBlock:^BOOL(id value) {
-        EXPECT_TRUE([value isKindOfClass:[AppStartupParameters class]]);
+        EXPECT_TRUE([value isKindOfClass:[AppStartupParameters class]] ||
+                    value == nil);
 
-        AppStartupParameters* startupParameters = (AppStartupParameters*)value;
-        const GURL calledURL = startupParameters.externalURL;
-        return calledURL == net::GURLWithNSURL(intent.url);
+        if (value != nil) {
+          AppStartupParameters* startupParameters =
+              (AppStartupParameters*)value;
+          const GURL calledURL = startupParameters.externalURL;
+          EXPECT_TRUE((int)[intent.url count] == 3);
+          return [intent.url containsObject:(net::NSURLWithGURL(calledURL))];
+        } else {
+          return YES;
+        }
       }]];
 
   MockTabOpener* tabOpener = [[MockTabOpener alloc] init];
 
+  std::vector<GURL> URLs;
+  for (NSURL* URL in urls) {
+    URLs.push_back(net::GURLWithNSURL(URL));
+  }
+
   AppStartupParameters* startupParams =
-      [[AppStartupParameters alloc] initWithExternalURL:gurl completeURL:gurl];
+      [[AppStartupParameters alloc] initWithURLs:URLs];
   [[[connectionInformationMock stub] andReturn:startupParams]
       startupParameters];
 
@@ -661,9 +692,9 @@ TEST_F(UserActivityHandlerTest, ContinueUserActivityIntentForeground) {
                              startupInformation:startupInformationMock];
 
   // Test.
-  EXPECT_EQ(gurl, tabOpener.urlLoadParams.web_params.url);
-  EXPECT_TRUE(tabOpener.urlLoadParams.web_params.virtual_url.is_empty());
+  EXPECT_OCMOCK_VERIFY(startupInformationMock);
   EXPECT_TRUE(result);
+  EXPECT_EQ(3U, tabOpener.URLs.size());
 }
 
 // Tests that handleStartupParameters with a file url. "external URL" gets

ios/chrome/app/intents/Intents.intentdefinition

@@ -29,8 +29,6 @@
 			<true/>
 			<key>INIntentInput</key>
 			<string>url</string>
-			<key>INIntentKeyParameter</key>
-			<string>url</string>
 			<key>INIntentLastParameterTag</key>
 			<integer>6</integer>
 			<key>INIntentManagedParameterCombinations</key>
@@ -68,13 +66,15 @@
 							<key>INIntentParameterPromptDialogCustom</key>
 							<true/>
 							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Which URL?</string>
+							<string>What URL?</string>
 							<key>INIntentParameterPromptDialogFormatStringID</key>
 							<string>3PpdH5</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
 					</array>
+					<key>INIntentParameterSupportsMultipleValues</key>
+					<true/>
 					<key>INIntentParameterSupportsResolution</key>
 					<true/>
 					<key>INIntentParameterTag</key>