Start removing deprecated Options UI code

chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 
 #include <stddef.h>
 
 #include "base/feature_list.h"

[Lei Zhang, 2017/06/03 01:03:49]

Delete? I'd just grep for FeatureList in all the modified files.

[Dan Beam, 2017/06/06 03:52:50]

Done.

 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service_factory.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 160 matching lines @@
        i != chrome_builtins.end(); ++i)
     builtins.push_back(base::ASCIIToUTF16(*i));
 
 #if !defined(OS_ANDROID)
   base::string16 settings(base::ASCIIToUTF16(chrome::kChromeUISettingsHost) +
                           base::ASCIIToUTF16("/"));
   for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) {
     builtins.push_back(settings +
                        base::ASCIIToUTF16(kChromeSettingsSubPages[i]));
   }
-
-  if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
-    builtins.push_back(
-        settings +
-        base::ASCIIToUTF16(
-            chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage));
-  }
 #endif
 
   return builtins;
 }
 
 std::vector<base::string16>
 ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
   std::vector<base::string16> builtins_to_provide;
   builtins_to_provide.push_back(
       base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL));
@@ skipping 86 matching lines @@
   image_service->Prefetch(url, traffic_annotation);
 }
 
 void ChromeAutocompleteProviderClient::OnAutocompleteControllerResultReady(
     AutocompleteController* controller) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
       content::Source<AutocompleteController>(controller),
       content::NotificationService::NoDetails());
 }