Delete the old hotwording integration.

chrome/browser/ui/webui/voice_search_ui.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/ui/webui/voice_search_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_enumerator.h"
@@ skipping 150 matching lines @@
     // Store Key-Value pairs of about-information.
     scoped_ptr<base::ListValue> list(new base::ListValue());
 
     // Populate information.
     AddOperatingSystemInfo(list.get());
     AddAudioInfo(list.get());
     AddLanguageInfo(list.get());
     AddHotwordInfo(list.get());
     AddAppListInfo(list.get());
 
-    std::string extension_id = extension_misc::kHotwordExtensionId;
-    HotwordService* hotword_service =
-        HotwordServiceFactory::GetForProfile(profile_);
-    if (hotword_service && hotword_service->IsExperimentalHotwordingEnabled())
-      extension_id = extension_misc::kHotwordNewExtensionId;
-    AddExtensionInfo(extension_id, "Extension", list.get());
+    AddExtensionInfo(extension_misc::kHotwordNewExtensionId,
+                     "Extension",
+                     list.get());
 
     AddExtensionInfo(extension_misc::kHotwordSharedModuleId,
                      "Shared Module",
                      list.get());
 
     base::FilePath path;
     extensions::ExtensionSystem* extension_system =
         extensions::ExtensionSystem::Get(profile_);
     if (extension_system) {
       ExtensionService* extension_service =
@@ skipping 132 matching lines @@
     HotwordService* hotword_service =
         HotwordServiceFactory::GetForProfile(profile_);
     if (hotword_service && hotword_service->IsOptedIntoAudioLogging())
       audio_logging_enabled = "Yes";
     AddPair(list, "Hotword Audio Logging Enabled", audio_logging_enabled);
 
     std::string group = base::FieldTrialList::FindFullName(
         hotword_internal::kHotwordFieldTrialName);
     AddPair(list, "Field trial", group);
 
-    std::string new_hotwording_enabled = "No";
-    if (hotword_service && hotword_service->IsExperimentalHotwordingEnabled())
-      new_hotwording_enabled = "Yes";
-    AddPair(list, "New Hotwording Enabled", new_hotwording_enabled);
-
     AddLineBreak(list);
   }
 
   // Adds information specific to an extension to the list.
   void AddExtensionInfo(const std::string& extension_id,
                         const std::string& name_prefix,
                         base::ListValue* list) {
     DCHECK(!name_prefix.empty());
     std::string version("undefined");
     std::string id("undefined");
@@ skipping 100 matching lines @@
 VoiceSearchUI::VoiceSearchUI(content::WebUI* web_ui)
     : content::WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
   web_ui->AddMessageHandler(new VoiceSearchDomHandler(profile));
 
   // Set up the about:voicesearch source.
   content::WebUIDataSource::Add(profile, CreateVoiceSearchUiHtmlSource());
 }
 
 VoiceSearchUI::~VoiceSearchUI() {}