[Mac] Remove Touch Bar feature flag and switch

Bug: 873219
Change-Id: I34a7c5024e84d6c2f65f1b6df122dde4ca3798f9
Reviewed-on: https://chromium-review.googlesource.com/1208359Reviewed-by: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Sarah Chan <spqchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589052}

chrome/browser/about_flags.cc

@@ -3469,9 +3469,6 @@ const FeatureEntry kFeatureEntries[] = {
 #endif  // !defined(OS_ANDROID)
 
 #if defined(OS_MACOSX)
-    {"mac-touchbar", flag_descriptions::kMacTouchBarName,
-     flag_descriptions::kMacTouchBarDescription, kOsMac,
-     FEATURE_VALUE_TYPE(features::kBrowserTouchBar)},
     {"dialog-touchbar", flag_descriptions::kDialogTouchBarName,
      flag_descriptions::kDialogTouchBarDescription, kOsMac,
      FEATURE_VALUE_TYPE(features::kDialogTouchBar)},

chrome/browser/app_controller_mac.mm

@@ -409,11 +409,9 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
 
   // If the OSX version supports this method, the system will automatically
   // hide the item if there's no touch bar. However, for unsupported versions,
-  // we'll have to manually remove the item from the menu. The item also has
-  // to be removed if the feature is disabled.
+  // we'll have to manually remove the item from the menu.
   if (![NSApp
-          respondsToSelector:@selector(toggleTouchBarCustomizationPalette:)] ||
-      !base::FeatureList::IsEnabled(features::kBrowserTouchBar)) {
+          respondsToSelector:@selector(toggleTouchBarCustomizationPalette:)]) {
     NSMenu* mainMenu = [NSApp mainMenu];
     NSMenu* viewMenu = [[mainMenu itemWithTag:IDC_VIEW_MENU] submenu];
     NSMenuItem* customizeItem = [viewMenu itemWithTag:IDC_CUSTOMIZE_TOUCH_BAR];

chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar_unittest.mm

@@ -8,7 +8,6 @@
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
-#include "base/test/scoped_feature_list.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/browser.h"
@@ -17,7 +16,6 @@
 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
-#include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -51,8 +49,6 @@ class BrowserWindowDefaultTouchBarUnitTest : public CocoaProfileTest {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
-    feature_list.InitAndEnableFeature(features::kBrowserTouchBar);
-
     command_updater_ = browser()->command_controller();
 
     touch_bar_.reset([[BrowserWindowDefaultTouchBar alloc]
@@ -79,9 +75,6 @@ class BrowserWindowDefaultTouchBarUnitTest : public CocoaProfileTest {
 
   CommandUpdater* command_updater_;  // Weak, owned by Browser.
 
-  // Used to enable the the browser window touch bar.
-  base::test::ScopedFeatureList feature_list;
-
   base::scoped_nsobject<BrowserWindowDefaultTouchBar> touch_bar_;
 };
 

chrome/common/chrome_features.cc

@@ -115,12 +115,6 @@ const base::Feature kBookmarkApps{"BookmarkAppsMac",
 const base::Feature kBrowserHangFixesExperiment{
     "BrowserHangFixesExperiment", base::FEATURE_DISABLED_BY_DEFAULT};
 
-#if defined(OS_MACOSX)
-// Enables or disables the browser's touch bar.
-const base::Feature kBrowserTouchBar{"BrowserTouchBar",
-                                     base::FEATURE_ENABLED_BY_DEFAULT};
-#endif
-
 // Enables or disables redirecting users who get an interstitial when
 // accessing https://support.google.com/chrome/answer/6098869 to local
 // connection help content.

chrome/common/chrome_features.h

@@ -77,10 +77,6 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBookmarkApps;
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kBrowserHangFixesExperiment;
 
-#if defined(OS_MACOSX)
-COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBrowserTouchBar;
-#endif
-
 COMPONENT_EXPORT(CHROME_FEATURES)
 extern const base::Feature kBundledConnectionHelpFeature;