Removed XCallbackParameters and related code.

ios/chrome/app/chrome_app_startup_parameters.mm

 // 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.
 
 #import "ios/chrome/app/chrome_app_startup_parameters.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/chrome/browser/chrome_url_constants.h"
-#include "ios/chrome/browser/xcallback_parameters.h"
 #include "ios/chrome/common/app_group/app_group_constants.h"
 #include "ios/chrome/common/x_callback_url.h"
 #import "net/base/mac/url_conversions.h"
 #include "url/gurl.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 @implementation ChromeAppStartupParameters {
   NSString* _secureSourceApp;
   NSString* _declaredSourceApp;
   NSURL* _completeURL;
 }
 
 - (instancetype)initWithExternalURL:(const GURL&)externalURL
-                xCallbackParameters:(XCallbackParameters*)xCallbackParameters {
-  NOTREACHED();
-  return nil;
-}
-
-- (instancetype)initWithExternalURL:(const GURL&)externalURL
-                xCallbackParameters:(XCallbackParameters*)xCallbackParameters
                   declaredSourceApp:(NSString*)declaredSourceApp
                     secureSourceApp:(NSString*)secureSourceApp
                         completeURL:(NSURL*)completeURL {
-  self = [super initWithExternalURL:externalURL
-                xCallbackParameters:xCallbackParameters];
+  self = [super initWithExternalURL:externalURL];
   if (self) {
     _declaredSourceApp = [declaredSourceApp copy];
     _secureSourceApp = [secureSourceApp copy];
     _completeURL = completeURL;
   }
   return self;
 }
 
 + (instancetype)newChromeAppStartupParametersWithURL:(NSURL*)completeURL
                                fromSourceApplication:(NSString*)appId {
@@ skipping 32 matching lines @@
                               MOBILE_SESSION_START_ACTION_COUNT);
 
     std::map<std::string, std::string> parameters =
         ExtractQueryParametersFromXCallbackURL(gurl);
     GURL url = GURL(parameters["url"]);
     if (!url.is_valid() ||
         (!url.SchemeIs(url::kHttpScheme) && !url.SchemeIs(url::kHttpsScheme))) {
       return nil;
     }
 
-    XCallbackParameters* xcallbackParameters =
-        [[XCallbackParameters alloc] initWithSourceAppId:appId];
-
     return [[ChromeAppStartupParameters alloc]
         initWithExternalURL:url
-        xCallbackParameters:xcallbackParameters
           declaredSourceApp:appId
             secureSourceApp:nil
                 completeURL:completeURL];
 
   } else if (gurl.SchemeIsFile()) {
     UMA_HISTOGRAM_ENUMERATION(kUMAMobileSessionStartActionHistogram,
                               START_ACTION_OPEN_FILE,
                               MOBILE_SESSION_START_ACTION_COUNT);
     // |url| is the path to a file received from another application.
     GURL::Replacements replacements;
     const std::string host(kChromeUIExternalFileHost);
     std::string filename = gurl.ExtractFileName();
     replacements.SetPathStr(filename);
     replacements.SetSchemeStr(kChromeUIScheme);
     replacements.SetHostStr(host);
     GURL externalURL = gurl.ReplaceComponents(replacements);
     if (!externalURL.is_valid())
       return nil;
     return [[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL
-                                               xCallbackParameters:nil
                                                  declaredSourceApp:appId
                                                    secureSourceApp:nil
                                                        completeURL:completeURL];
   } else {
     // Replace the scheme with https or http depending on whether the input
     // |url| scheme ends with an 's'.
     BOOL useHttps = gurl.scheme()[gurl.scheme().length() - 1] == 's';
     MobileSessionStartAction action =
         useHttps ? START_ACTION_OPEN_HTTPS : START_ACTION_OPEN_HTTP;
     UMA_HISTOGRAM_ENUMERATION(kUMAMobileSessionStartActionHistogram, action,
                               MOBILE_SESSION_START_ACTION_COUNT);
     GURL::Replacements replace_scheme;
     if (useHttps)
       replace_scheme.SetSchemeStr(url::kHttpsScheme);
     else
       replace_scheme.SetSchemeStr(url::kHttpScheme);
     GURL externalURL = gurl.ReplaceComponents(replace_scheme);
     if (!externalURL.is_valid())
       return nil;
     return [[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL
-                                               xCallbackParameters:nil
                                                  declaredSourceApp:appId
                                                    secureSourceApp:nil
                                                        completeURL:completeURL];
   }
 }
 
 + (instancetype)newExtensionCommandAppStartupParametersFromWithURL:(NSURL*)url
                                              fromSourceApplication:
                                                  (NSString*)appId {
   NSString* appGroup = app_group::ApplicationGroup();
@@ skipping 56 matching lines @@
 + (instancetype)newAppStartupParametersForCommand:(NSString*)command
                                     withParameter:(id)parameter
                                           withURL:(NSURL*)url
                             fromSourceApplication:(NSString*)appId
                       fromSecureSourceApplication:(NSString*)secureSourceApp {
   if ([command
           isEqualToString:base::SysUTF8ToNSString(
                               app_group::kChromeAppGroupVoiceSearchCommand)]) {
     ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
-        xCallbackParameters:nil
           declaredSourceApp:appId
             secureSourceApp:secureSourceApp
                 completeURL:url];
     [params setLaunchVoiceSearch:YES];
     return params;
   }
 
   if ([command isEqualToString:base::SysUTF8ToNSString(
                                    app_group::kChromeAppGroupNewTabCommand)]) {
     return [[ChromeAppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
-        xCallbackParameters:nil
           declaredSourceApp:appId
             secureSourceApp:secureSourceApp
                 completeURL:url];
   }
 
   if ([command
           isEqualToString:base::SysUTF8ToNSString(
                               app_group::kChromeAppGroupFocusOmniboxCommand)]) {
     ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
-        xCallbackParameters:nil
           declaredSourceApp:appId
             secureSourceApp:secureSourceApp
                 completeURL:url];
     [params setLaunchFocusOmnibox:YES];
     return params;
   }
 
   if ([command isEqualToString:base::SysUTF8ToNSString(
                                    app_group::kChromeAppGroupOpenURLCommand)]) {
     if (!parameter || ![parameter isKindOfClass:[NSString class]])
       return nil;
     GURL externalURL(base::SysNSStringToUTF8(parameter));
     if (!externalURL.is_valid() || !externalURL.SchemeIsHTTPOrHTTPS())
       return nil;
     return
         [[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL
-                                            xCallbackParameters:nil
                                               declaredSourceApp:appId
                                                 secureSourceApp:secureSourceApp
                                                     completeURL:url];
   }
 
   if ([command
           isEqualToString:base::SysUTF8ToNSString(
                               app_group::kChromeAppGroupQRScannerCommand)]) {
     ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
-        xCallbackParameters:nil
           declaredSourceApp:appId
             secureSourceApp:secureSourceApp
                 completeURL:url];
     [params setLaunchQRScanner:YES];
     return params;
   }
 
   if ([command isEqualToString:
                    base::SysUTF8ToNSString(
                        app_group::kChromeAppGroupIncognitoSearchCommand)]) {
     ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc]
         initWithExternalURL:GURL(kChromeUINewTabURL)
-        xCallbackParameters:nil
           declaredSourceApp:appId
             secureSourceApp:secureSourceApp
                 completeURL:url];
     [params setLaunchInIncognito:YES];
     [params setLaunchFocusOmnibox:YES];
     return params;
   }
 
   return nil;
 }
@@ skipping 53 matching lines @@
   }
   if (found.location > 0) {
     unichar charBefore = [query characterAtIndex:(found.location - 1)];
     if (charBefore != '&')
       return first_run::LAUNCH_BY_MOBILESAFARI;
   }
   return first_run::LAUNCH_BY_SMARTAPPBANNER;
 }
 
 @end