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

content/shell/shell_browser_context.cc

Index: content/shell/shell_browser_context.cc
diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
index fed9fba1ea7846601986113e58b7655f6aaa57ff..56583e2d46213fc2dfed7a8026c811ee66512b52 100644
--- a/content/shell/shell_browser_context.cc
+++ b/content/shell/shell_browser_context.cc
@@ -20,6 +20,7 @@
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/resource_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 "net/base/cert_verifier.h"
 #include "net/base/cookie_monster.h"
@@ -218,6 +219,23 @@ class ShellGeolocationPermissionContext : public GeolocationPermissionContext {
   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 {
@@ -317,6 +335,12 @@ GeolocationPermissionContext*
   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;
 }