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

chrome/browser/ui/search/search_ipc_router.cc

 // Copyright 2013 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_ipc_router.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/render_messages.h"
 #include "components/search/search.h"
@@ skipping 119 matching lines @@
 }
 
 void SearchIPCRouter::SendThemeBackgroundInfo(
     const ThemeBackgroundInfo& theme_info) {
   if (!policy_->ShouldSendThemeBackgroundInfo())
     return;
 
   Send(new ChromeViewMsg_SearchBoxThemeChanged(routing_id(), theme_info));
 }
 
-void SearchIPCRouter::ToggleVoiceSearch() {
-  if (!policy_->ShouldSendToggleVoiceSearch())
-    return;
-
-  Send(new ChromeViewMsg_SearchBoxToggleVoiceSearch(routing_id()));
-}
-
 void SearchIPCRouter::Submit(const base::string16& text,
                              const EmbeddedSearchRequestParams& params) {
   if (!policy_->ShouldSubmitQuery())
     return;
 
   Send(new ChromeViewMsg_SearchBoxSubmit(routing_id(), text, params));
 }
 
 void SearchIPCRouter::OnTabActivated() {
   is_active_tab_ = true;
 }
 
 void SearchIPCRouter::OnTabDeactivated() {
   is_active_tab_ = false;
 }
 
 bool SearchIPCRouter::OnMessageReceived(const IPC::Message& message) {
   if (IPC_MESSAGE_CLASS(message) != ChromeMsgStart)
     return false;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   if (!search::IsRenderedInInstantProcess(web_contents(), profile))
     return false;
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchIPCRouter, message)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_InstantSupportDetermined,
                         OnInstantSupportDetermined)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SetVoiceSearchSupported,
-                        OnVoiceSearchSupportDetermined)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_FocusOmnibox, OnFocusOmnibox);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxNavigate,
                         OnSearchBoxNavigate);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem,
                         OnDeleteMostVisitedItem);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion,
                         OnUndoMostVisitedDeletion);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_SearchBoxUndoAllMostVisitedDeletions,
                         OnUndoAllMostVisitedDeletions);
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_LogEvent, OnLogEvent);
@@ skipping 13 matching lines @@
 }
 
 void SearchIPCRouter::OnInstantSupportDetermined(int page_seq_no,
                                                  bool instant_support) const {
   if (page_seq_no != commit_counter_)
     return;
 
   delegate_->OnInstantSupportDetermined(instant_support);
 }
 
-void SearchIPCRouter::OnVoiceSearchSupportDetermined(
-    int page_seq_no,
-    bool supports_voice_search) const {
-  if (page_seq_no != commit_counter_)
-    return;
-
-  delegate_->OnInstantSupportDetermined(true);
-  if (!policy_->ShouldProcessSetVoiceSearchSupport())
-    return;
-
-  delegate_->OnSetVoiceSearchSupport(supports_voice_search);
-}
-
 void SearchIPCRouter::OnFocusOmnibox(int page_seq_no,
                                      OmniboxFocusState state) const {
   if (page_seq_no != commit_counter_)
     return;
 
   delegate_->OnInstantSupportDetermined(true);
   if (!policy_->ShouldProcessFocusOmnibox(is_active_tab_))
     return;
 
   delegate_->FocusOmnibox(state);
@@ skipping 126 matching lines @@
 
 void SearchIPCRouter::set_delegate_for_testing(Delegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 }
 
 void SearchIPCRouter::set_policy_for_testing(scoped_ptr<Policy> policy) {
   DCHECK(policy.get());
   policy_.reset(policy.release());
 }