Reland of "Remove setVoiceSearchSupported part of EmbeddedSearch SearchBox API." (patchset #4 id:60…

chrome/browser/ui/search/search_model.cc

 // Copyright (c) 2012 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/search/search_model.h"
 
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "components/search/search.h"
 
-SearchModel::State::State()
-    : instant_support(INSTANT_SUPPORT_UNKNOWN),
-      voice_search_supported(false) {
-}
+SearchModel::State::State() : instant_support(INSTANT_SUPPORT_UNKNOWN) {}
 
 SearchModel::State::State(const SearchMode& mode,
-                          InstantSupportState instant_support,
-                          bool voice_search_supported)
-    : mode(mode),
-      instant_support(instant_support),
-      voice_search_supported(voice_search_supported) {
-}
+                          InstantSupportState instant_support)
+    : mode(mode), instant_support(instant_support) {}
 
 bool SearchModel::State::operator==(const State& rhs) const {
-  return mode == rhs.mode && instant_support == rhs.instant_support &&
-      voice_search_supported == rhs.voice_search_supported;
+  return mode == rhs.mode && instant_support == rhs.instant_support;
 }
 
 SearchModel::SearchModel() {
 }
 
 SearchModel::~SearchModel() {
 }
 
 void SearchModel::SetState(const State& new_state) {
   DCHECK(search::IsInstantExtendedAPIEnabled())
@@ skipping 32 matching lines @@
 
   if (state_.instant_support == instant_support)
     return;
 
   const State old_state = state_;
   state_.instant_support = instant_support;
   FOR_EACH_OBSERVER(SearchModelObserver, observers_,
                     ModelChanged(old_state, state_));
 }
 
-void SearchModel::SetVoiceSearchSupported(bool supported) {
-  DCHECK(search::IsInstantExtendedAPIEnabled())
-      << "Please do not try to set the SearchModel state without first "
-      << "checking if Search is enabled.";
-
-  if (state_.voice_search_supported == supported)
-    return;
-
-  const State old_state = state_;
-  state_.voice_search_supported = supported;
-
-  FOR_EACH_OBSERVER(SearchModelObserver, observers_,
-                    ModelChanged(old_state, state_));
-}
-
 void SearchModel::AddObserver(SearchModelObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void SearchModel::RemoveObserver(SearchModelObserver* observer) {
   observers_.RemoveObserver(observer);
 }