Introduced StoreKitTabHelper class

ios/chrome/browser/tabs/tab.mm

 // Copyright 2012 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/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 67 matching lines @@
 #include "ios/chrome/browser/sessions/ios_chrome_session_tab_helper.h"
 #include "ios/chrome/browser/signin/account_consistency_service_factory.h"
 #include "ios/chrome/browser/signin/account_reconcilor_factory.h"
 #include "ios/chrome/browser/signin/authentication_service.h"
 #include "ios/chrome/browser/signin/authentication_service_factory.h"
 #include "ios/chrome/browser/signin/signin_capability.h"
 #import "ios/chrome/browser/snapshots/snapshot_manager.h"
 #import "ios/chrome/browser/snapshots/snapshot_overlay_provider.h"
 #import "ios/chrome/browser/snapshots/web_controller_snapshot_helper.h"
 #include "ios/chrome/browser/ssl/ios_security_state_tab_helper.h"
-#import "ios/chrome/browser/storekit_launcher.h"
+#import "ios/chrome/browser/store_kit/store_kit_tab_helper.h"
 #include "ios/chrome/browser/sync/ios_chrome_synced_tab_delegate.h"
 #import "ios/chrome/browser/tabs/legacy_tab_helper.h"
 #import "ios/chrome/browser/tabs/tab_delegate.h"
 #import "ios/chrome/browser/tabs/tab_dialog_delegate.h"
 #import "ios/chrome/browser/tabs/tab_headers_delegate.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_private.h"
 #import "ios/chrome/browser/tabs/tab_snapshotting_delegate.h"
 #include "ios/chrome/browser/translate/chrome_ios_translate_client.h"
 #import "ios/chrome/browser/u2f/u2f_controller.h"
@@ skipping 116 matching lines @@
 }  // namespace
 
 @interface Tab ()<CRWWebStateObserver,
                   FindInPageControllerDelegate,
                   ReaderModeControllerDelegate> {
   TabModel* parentTabModel_;               // weak
   ios::ChromeBrowserState* browserState_;  // weak
 
   base::scoped_nsobject<OpenInController> openInController_;
   base::WeakNSProtocol<id<PassKitDialogProvider>> passKitDialogProvider_;
-  // TODO(crbug.com/546213): Move this out of Tab, probably to native app
-  // launcher since that's the only thing that uses it.
-  base::WeakNSProtocol<id<StoreKitLauncher>> storeKitLauncher_;
 
   // Whether or not this tab is currently being displayed.
   BOOL visible_;
 
   // Holds entries that need to be added to the history DB.  Prerender tabs do
   // not write navigation data to the history DB.  Instead, they cache history
   // data in this vector and add it to the DB when the prerender status is
   // removed (when the Tab is swapped in as a real Tab).
   std::vector<history::HistoryAddPageArgs> addPageVector_;
 
@@ skipping 326 matching lines @@
       IOSChromeSessionTabHelper::CreateForWebState(self.webState);
 
       NetworkActivityIndicatorTabHelper::CreateForWebState(self.webState,
                                                            self.tabId);
       IOSChromeSyncedTabDelegate::CreateForWebState(self.webState);
       InfoBarManagerImpl::CreateForWebState(self.webState);
       IOSSecurityStateTabHelper::CreateForWebState(self.webState);
       RepostFormTabHelper::CreateForWebState(self.webState);
       BlockedPopupTabHelper::CreateForWebState(self.webState);
       FindTabHelper::CreateForWebState(self.webState, self);
+      StoreKitTabHelper::CreateForWebState(self.webState);
 
       if (reading_list::switches::IsReadingListEnabled()) {
         ReadingListModel* model =
             ReadingListModelFactory::GetForBrowserState(browserState_);
         ReadingListWebStateObserver::FromWebState(self.webState, model);
       }
 
       tabInfoBarObserver_.reset(new TabInfoBarObserver(self));
       tabInfoBarObserver_->SetShouldObserveInfoBarManager(true);
 
@@ skipping 295 matching lines @@
 
 - (web::NavigationManager*)navigationManager {
   return webStateImpl_ ? webStateImpl_->GetNavigationManager() : nullptr;
 }
 
 - (web::NavigationManagerImpl*)navigationManagerImpl {
   return webStateImpl_ ? &(webStateImpl_->GetNavigationManagerImpl()) : nullptr;
 }
 
 - (id<StoreKitLauncher>)storeKitLauncher {
-  return storeKitLauncher_.get();
+  StoreKitTabHelper* tab_helper =
+      StoreKitTabHelper::FromWebState(self.webState);
+  return tab_helper ? tab_helper->GetLauncher() : nil;
 }
 
 - (void)setStoreKitLauncher:(id<StoreKitLauncher>)storeKitLauncher {
-  storeKitLauncher_.reset(storeKitLauncher);
+  StoreKitTabHelper* tab_helper =
+      StoreKitTabHelper::FromWebState(self.webState);
+  if (tab_helper)
+    tab_helper->SetLauncher(storeKitLauncher);
 }
 
 // Swap out the existing session history with a new list of navigations. Forces
 // the tab to reload to update the UI accordingly. This is ok because none of
 // the session history is stored in the tab; it's always fetched through the
 // navigation manager.
 - (void)replaceHistoryWithNavigations:
             (const std::vector<sessions::SerializedNavigationEntry>&)navigations
                          currentIndex:(NSInteger)currentIndex {
   std::vector<std::unique_ptr<web::NavigationItem>> items =
@@ skipping 301 matching lines @@
 }
 
 // This can't be done in dealloc in case someone holds an extra strong
 // reference to the Tab, which would cause the close sequence to fire at a
 // random time.
 - (void)close {
   self.fullScreenControllerDelegate = nil;
   self.overscrollActionsControllerDelegate = nil;
   self.passKitDialogProvider = nil;
   self.snapshotOverlayProvider = nil;
-  self.storeKitLauncher = nil;
 
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   [passwordController_ detach];
   passwordController_.reset();
   tabInfoBarObserver_.reset();
 
   faviconDriverObserverBridge_.reset();
   [openInController_ detachFromWebController];
   openInController_.reset();
@@ skipping 218 matching lines @@
 - (void)closeThisTab {
   if (!parentTabModel_)
     return;
 
   NSUInteger index = [parentTabModel_ indexOfTab:self];
   if (index != NSNotFound)
     [parentTabModel_ closeTabAtIndex:index];
 }
 
 - (id<CRWNativeContent>)controllerForUnhandledContentAtURL:(const GURL&)url {
+  id<StoreKitLauncher> storeKitLauncher =

[sdefresne, 2017/03/06 19:44:03]

The tab helper may be null during tests, can you check for this?

  id<StoreKitLauncher> storeKitLauncher = nil;
  StoreKitTabHelper* tabHelper =
      StoreKitTabHelper::FromWebState(self.webState);
  if (tabHelper)
    storeKitLauncher = tabHelper->GetLauncher();

[pkl (ping after 24h if needed), 2017/03/07 01:17:54]

Done.

+      StoreKitTabHelper::FromWebState(self.webState)->GetLauncher();
   DownloadManagerController* downloadController =
       [[[DownloadManagerController alloc]
                    initWithURL:url
           requestContextGetter:browserState_->GetRequestContext()
-              storeKitLauncher:self.storeKitLauncher] autorelease];
+              storeKitLauncher:storeKitLauncher] autorelease];
   [downloadController start];
   return downloadController;
 }
 
 - (void)handleExportableFile:(net::HttpResponseHeaders*)headers {
   // Only "application/pdf" is supported for now.
   if (self.webState->GetContentsMimeType() != "application/pdf")
     return;
 
   [[NSNotificationCenter defaultCenter]
@@ skipping 81 matching lines @@
   // triggered reader mode before the page load is detected by webState.
   if (url == self.url)
     [self.webController loadHTMLForCurrentURL:html];
 
   [self.readerModeController exitReaderMode];
 }
 
 #pragma mark -
 
 - (void)openAppStore:(NSString*)appId {
-  [storeKitLauncher_ openAppStore:appId];
+  StoreKitTabHelper::FromWebState(self.webState)->OpenAppStore(appId);

[sdefresne, 2017/03/06 19:44:03]

The tab helper may be null during tests, can you check for this?

  StoreKitTabHelper* tabHelper =
      StoreKitTabHelper::FromWebState(self.webState);
  if (tabHelper)
    tabHelper->OpenAppStore(appId);

[pkl (ping after 24h if needed), 2017/03/07 01:17:54]

Done.

 }
 
 - (BOOL)usesDesktopUserAgent {
   if (!self.navigationManager)
     return NO;
 
   web::NavigationItem* visibleItem = self.navigationManager->GetVisibleItem();
   return visibleItem &&
          visibleItem->GetUserAgentType() == web::UserAgentType::DESKTOP;
 }
@@ skipping 619 matching lines @@
 - (NativeAppNavigationController*)nativeAppNavigationController {
   return nativeAppNavigationController_;
 }
 
 - (void)initNativeAppNavigationController {
   if (browserState_->IsOffTheRecord())
     return;
   DCHECK(!nativeAppNavigationController_);
   nativeAppNavigationController_.reset([[NativeAppNavigationController alloc]
           initWithWebState:self.webState
-      requestContextGetter:browserState_->GetRequestContext()
-                       tab:self]);
+      requestContextGetter:browserState_->GetRequestContext()]);
   [self.webController addObserver:nativeAppNavigationController_];
   DCHECK(nativeAppNavigationController_);
 }
 
 - (id<PassKitDialogProvider>)passKitDialogProvider {
   return passKitDialogProvider_.get();
 }
 
 - (void)setPassKitDialogProvider:(id<PassKitDialogProvider>)provider {
   passKitDialogProvider_.reset(provider);
@@ skipping 25 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end