[App Management] Add Settings Split flag check.

App Management has been moved to be inside OS Settings. This CL checks
if kSettingSplit has been enabled before checking if App Management has
been enabled.

Bug: 1000104
Change-Id: I3971cde76ab359d5f7e1168318d181818d4c30a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1782362
Auto-Submit: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693216}

chrome/browser/ui/app_list/app_list_controller_delegate.cc

@@ -22,6 +22,7 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
+#include "chromeos/constants/chromeos_features.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -94,7 +95,8 @@ void AppListControllerDelegate::DoShowAppInfoFlow(
   const extensions::Extension* extension = GetExtension(profile, extension_id);
   DCHECK(extension);
 
-  if (base::FeatureList::IsEnabled(features::kAppManagement)) {
+  if (base::FeatureList::IsEnabled(chromeos::features::kSplitSettings) &&
+      base::FeatureList::IsEnabled(features::kAppManagement)) {
     chrome::ShowAppManagementPage(profile, extension_id);
     return;
   }

chrome/browser/ui/app_list/arc/arc_app_context_menu.cc

@@ -20,6 +20,7 @@
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/constants/chromeos_features.h"
 
 ArcAppContextMenu::ArcAppContextMenu(app_list::AppContextMenuDelegate* delegate,
                                      Profile* profile,
@@ -132,7 +133,8 @@ void ArcAppContextMenu::ShowPackageInfo() {
             << app_id() << ".";
     return;
   }
-  if (base::FeatureList::IsEnabled(features::kAppManagement)) {
+  if (base::FeatureList::IsEnabled(chromeos::features::kSplitSettings) &&
+      base::FeatureList::IsEnabled(features::kAppManagement)) {
     chrome::ShowAppManagementPage(profile(), app_id());
     return;
   }