Remove VIEW_TYPE_WEB_CONTENTS and make default view type INVALID.

chrome/browser/speech/chrome_speech_recognition_manager_delegate.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/speech/chrome_speech_recognition_manager_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/common/chrome_view_type.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_view_host_delegate.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/speech_recognition_manager.h"
 #include "content/public/browser/speech_recognition_session_context.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "content/public/common/speech_recognition_result.h"
 #include "grit/generated_resources.h"
@@ skipping 201 matching lines @@
 
 void ChromeSpeechRecognitionManagerDelegate::CheckRenderViewType(
     int session_id,
     base::Callback<void(int session_id, bool is_allowed)> callback,
     int render_process_id,
     int render_view_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   const content::RenderViewHost* render_view_host =
       content::RenderViewHost::FromID(render_process_id, render_view_id);
 
-  // For host delegates other than VIEW_TYPE_WEB_CONTENTS we can't reliably show
+  // For host delegates other than VIEW_TYPE_TAB_CONTENTS we can't reliably show
   // a popup, including the speech input bubble. In these cases for privacy
   // reasons we don't want to start recording if the user can't be properly
   // notified. An example of this is trying to show the speech input bubble
   // within an extension popup: http://crbug.com/92083. In these situations the
   // speech input extension API should be used instead.
 
   const bool allowed = (render_view_host != NULL &&
                         render_view_host->GetDelegate() != NULL &&
                         render_view_host->GetDelegate()->GetRenderViewType() ==
-                            content::VIEW_TYPE_WEB_CONTENTS);
+                            chrome::VIEW_TYPE_TAB_CONTENTS);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, session_id, allowed));
 }
 
 }  // namespace speech