MD Settings: Fix Client Navigations to Search Query URLs

chrome/browser/interstitials/chrome_controller_client.cc

Index: chrome/browser/interstitials/chrome_controller_client.cc
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 29cff458cadaedd7d454a12c3da03d64995ca5c9..2c99b2dc8566b7bfa4fd866fcb81fef2597f2261 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -25,8 +25,10 @@
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "base/feature_list.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -51,9 +53,14 @@ void LaunchDateAndTimeSettingsOnFile() {
   chrome::android::OpenDateAndTimeSettings();
 
 #elif defined(OS_CHROMEOS)
-  std::string sub_page =
-      std::string(chrome::kSearchSubPage) + "#" +
-      l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+  std::string sub_page;
+  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+    sub_page = chrome::kBluetoothSubPage;

[Ryan Sleevi, 2016/10/27 17:11:12]

Date time

[tommycli, 2016/10/27 17:14:03]

Done.

+  } else {
+    sub_page =
+        std::string(chrome::kDeprecatedOptionsSearchSubPage) + "#" +
+        l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);

[Ryan Sleevi, 2016/10/27 17:11:12]

Shouldn't this be DATETIME?

[tommycli, 2016/10/27 17:14:03]

Done.

+  }
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);