Removed IsNativeAppLauncherEnabled() experiment

ios/chrome/browser/ui/settings/settings_collection_view_controller.mm

Index: ios/chrome/browser/ui/settings/settings_collection_view_controller.mm
diff --git a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm
index 6fde817cd096a603c25c91e0d1f4cca91869cad1..2ebae700c9557a2f0ed281b527d6a0c17b1b4670 100644
--- a/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/settings_collection_view_controller.mm
@@ -58,7 +58,6 @@
 #import "ios/chrome/browser/ui/settings/cells/account_signin_item.h"
 #import "ios/chrome/browser/ui/settings/content_settings_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/material_cell_catalog_view_controller.h"
-#import "ios/chrome/browser/ui/settings/native_apps_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/privacy_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.h"
 #import "ios/chrome/browser/ui/settings/search_engine_settings_collection_view_controller.h"
@@ -112,7 +111,6 @@ typedef NS_ENUM(NSInteger, ItemType) {
   ItemTypeSearchEngine,
   ItemTypeSavedPasswords,
   ItemTypeAutofill,
-  ItemTypeNativeApps,
   ItemTypeVoiceSearch,
   ItemTypePrivacy,
   ItemTypeContentSettings,
@@ -190,7 +188,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,
 
   // The current browser state. It is either |_mainBrowserState|
   // or |_mainBrowserState->GetOffTheRecordChromeBrowserState()|.
-  ios::ChromeBrowserState* _currentBrowserState;  // weak
   std::unique_ptr<SigninObserverBridge> _notificationBridge;
   std::unique_ptr<SyncObserverBridge> _syncObserverBridge;
   SigninInteractionController* _signinInteractionController;
@@ -239,17 +236,12 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,
 
 #pragma mark Initialization
 
-- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)mainBrowserState
-                 currentBrowserState:
-                     (ios::ChromeBrowserState*)currentBrowserState {
+- (instancetype)initWithBrowserState:
+    (ios::ChromeBrowserState*)mainBrowserState {

[Eugene But (OOO till 7-30), 2017/05/25 14:47:33]

ditto

[pkl (ping after 24h if needed), 2017/05/26 17:34:18]

Acknowledged.

   DCHECK(mainBrowserState);
-  DCHECK(currentBrowserState);
-  DCHECK_EQ(mainBrowserState,
-            currentBrowserState->GetOriginalChromeBrowserState());
   self = [super initWithStyle:CollectionViewControllerStyleAppBar];
   if (self) {
     _mainBrowserState = mainBrowserState;
-    _currentBrowserState = currentBrowserState;
     self.title = l10n_util::GetNSStringWithFixup(IDS_IOS_SETTINGS_TITLE);
     self.collectionViewAccessibilityIdentifier = kSettingsCollectionViewId;
     _notificationBridge.reset(
@@ -361,10 +353,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,
       toSectionWithIdentifier:SectionIdentifierBasics];
   [model addItem:[self autoFillDetailItem]
       toSectionWithIdentifier:SectionIdentifierBasics];
-  if (experimental_flags::IsNativeAppLauncherEnabled()) {
-    [model addItem:[self nativeAppsDetailItem]
-        toSectionWithIdentifier:SectionIdentifierBasics];
-  }
 
   // Advanced Section
   [model addSectionWithIdentifier:SectionIdentifierAdvanced];
@@ -495,13 +483,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,
   return _autoFillDetailItem;
 }
 
-- (CollectionViewItem*)nativeAppsDetailItem {
-  return [self
-      detailItemWithType:ItemTypeNativeApps
-                    text:l10n_util::GetNSString(IDS_IOS_GOOGLE_APPS_SM_SETTINGS)
-              detailText:nil];
-}
-
 - (CollectionViewItem*)voiceSearchDetailItem {
   voice::SpeechInputLocaleConfig* localeConfig =
       voice::SpeechInputLocaleConfig::GetInstance();
@@ -758,11 +739,6 @@ void SigninObserverBridge::GoogleSignedOut(const std::string& account_id,
       controller = [[AutofillCollectionViewController alloc]
           initWithBrowserState:_mainBrowserState];
       break;
-    case ItemTypeNativeApps:
-      controller = [[NativeAppsCollectionViewController alloc]
-          initWithURLRequestContextGetter:_currentBrowserState
-                                              ->GetRequestContext()];
-      break;
     case ItemTypeVoiceSearch:
       controller = [[VoicesearchCollectionViewController alloc]
           initWithPrefs:_mainBrowserState->GetPrefs()];