Remove use of default request context and fix use of speech censor flag

content/shell/shell_browser_context.cc

 // Copyright (c) 2011 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 "content/shell/shell_browser_context.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/chrome_blob_storage_context.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/download/mock_download_manager_delegate.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/geolocation/geolocation_permission_context.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/ssl/ssl_host_state.h"
+#include "content/browser/speech/speech_input_preferences.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_resource_context.h"
 #include "content/shell/shell_url_request_context_getter.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #endif
 
@@ skipping 18 matching lines @@
       int render_view_id,
       int bridge_id,
       const GURL& requesting_frame) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellGeolocationPermissionContext);
 };
 
+class ShellSpeechInputPreferences : public SpeechInputPreferences {
+ public:
+  ShellSpeechInputPreferences() {
+  }
+
+  // SpeechInputPreferences implementation.
+  virtual bool censor_results() const OVERRIDE {
+    return false;
+  }
+
+  virtual void set_censor_results(bool censor_results) OVERRIDE {
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ShellSpeechInputPreferences);
+};
+
 }  // namespace
 
 namespace content {
 
 ShellBrowserContext::ShellBrowserContext(
     ShellBrowserMainParts* shell_main_parts)
     : shell_main_parts_(shell_main_parts) {
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
@@ skipping 84 matching lines @@
 
 GeolocationPermissionContext*
     ShellBrowserContext::GetGeolocationPermissionContext()  {
   if (!geolocation_permission_context_) {
     geolocation_permission_context_ =
         new ShellGeolocationPermissionContext();
   }
   return geolocation_permission_context_;
 }
 
+SpeechInputPreferences* ShellBrowserContext::GetSpeechInputPreferences() {
+  if (!speech_input_preferences_.get())
+    speech_input_preferences_ = new ShellSpeechInputPreferences();
+  return speech_input_preferences_.get();
+}
+
 bool ShellBrowserContext::DidLastSessionExitCleanly()  {
   return true;
 }
 
 quota::QuotaManager* ShellBrowserContext::GetQuotaManager()  {
   CreateQuotaManagerAndClients();
   return quota_manager_.get();
 }
 
 WebKitContext* ShellBrowserContext::GetWebKitContext()  {
@@ skipping 53 matching lines @@
     NewRunnableMethod(
         appcache_service_.get(),
         &ChromeAppCacheService::InitializeOnIOThread,
         IsOffTheRecord()
             ? FilePath() : GetPath().Append(FILE_PATH_LITERAL("AppCache")),
         &GetResourceContext(),
         special_storage_policy));
 }
 
 }  // namespace content