Index: ios/chrome/app/application_delegate/user_activity_handler.mm |
diff --git a/ios/chrome/app/application_delegate/user_activity_handler.mm b/ios/chrome/app/application_delegate/user_activity_handler.mm |
index 6b3b9e8c9112b7c4154bce1a118aa998ea483384..aef4e85f5552da7f3379cc84c7d83194d6b38b93 100644 |
--- a/ios/chrome/app/application_delegate/user_activity_handler.mm |
+++ b/ios/chrome/app/application_delegate/user_activity_handler.mm |
@@ -9,7 +9,6 @@ |
#include "base/ios/block_types.h" |
#include "base/ios/ios_util.h" |
-#include "base/ios/weak_nsobject.h" |
#include "base/mac/foundation_util.h" |
#include "base/metrics/histogram_macros.h" |
#include "base/metrics/user_metrics_action.h" |
@@ -76,8 +75,8 @@ NSString* const kShortcutQRScanner = @"OpenQRScanner"; |
// at this time is opening a New Tab Page. |
GURL newTabURL(kChromeUINewTabURL); |
webpageURL = net::NSURLWithGURL(newTabURL); |
- base::scoped_nsobject<AppStartupParameters> startupParams( |
- [[AppStartupParameters alloc] initWithExternalURL:newTabURL]); |
+ AppStartupParameters* startupParams = |
+ [[AppStartupParameters alloc] initWithExternalURL:newTabURL]; |
[startupInformation setStartupParameters:startupParams]; |
base::RecordAction(base::UserMetricsAction("IOSLaunchedByUniversalLink")); |
} else if (spotlight::IsSpotlightAvailable() && |
@@ -101,9 +100,8 @@ NSString* const kShortcutQRScanner = @"OpenQRScanner"; |
if (domain == spotlight::DOMAIN_ACTIONS) { |
webpageURL = |
[NSURL URLWithString:base::SysUTF8ToNSString(kChromeUINewTabURL)]; |
- base::scoped_nsobject<AppStartupParameters> startupParams( |
- [[AppStartupParameters alloc] |
- initWithExternalURL:GURL(kChromeUINewTabURL)]); |
+ AppStartupParameters* startupParams = [[AppStartupParameters alloc] |
+ initWithExternalURL:GURL(kChromeUINewTabURL)]; |
BOOL startupParamsSet = spotlight::SetStartupParametersForSpotlightAction( |
itemID, startupParams); |
if (!startupParamsSet) { |
@@ -174,8 +172,8 @@ NSString* const kShortcutQRScanner = @"OpenQRScanner"; |
[startupInformation resetFirstUserActionRecorder]; |
if (![startupInformation startupParameters]) { |
- base::scoped_nsobject<AppStartupParameters> startupParams( |
- [[AppStartupParameters alloc] initWithExternalURL:webpageGURL]); |
+ AppStartupParameters* startupParams = |
+ [[AppStartupParameters alloc] initWithExternalURL:webpageGURL]; |
[startupInformation setStartupParameters:startupParams]; |
} |
return YES; |
@@ -256,9 +254,8 @@ NSString* const kShortcutQRScanner = @"OpenQRScanner"; |
if ([startupInformation isPresentingFirstRunUI]) |
return NO; |
- base::scoped_nsobject<AppStartupParameters> startupParams( |
- [[AppStartupParameters alloc] |
- initWithExternalURL:GURL(kChromeUINewTabURL)]); |
+ AppStartupParameters* startupParams = [[AppStartupParameters alloc] |
+ initWithExternalURL:GURL(kChromeUINewTabURL)]; |
if ([shortcutItem.type isEqualToString:kShortcutNewTab]) { |
base::RecordAction(UserMetricsAction("ApplicationShortcut.NewTabPressed")); |