Fix bug: AppShell: CHECK failure in PeerConnection init.

content/shell/browser/shell_url_request_context_getter.h

Index: content/shell/browser/shell_url_request_context_getter.h
diff --git a/content/shell/browser/shell_url_request_context_getter.h b/content/shell/browser/shell_url_request_context_getter.h
index 810e602dfea77e6350da0efc612158760ca5df2a..d3bcf2968442b5f1df9ba914eee1e7a158309310 100644
--- a/content/shell/browser/shell_url_request_context_getter.h
+++ b/content/shell/browser/shell_url_request_context_getter.h
@@ -17,6 +17,10 @@ namespace base {
 class MessageLoop;
 }
 
+namespace extensions {

[James Cook, 2014/10/07 16:24:54]

Delete this. It's not needed, and you can't refer to extensions code from
//content anyhow.

[Xi Han, 2014/10/07 19:29:53]

Oops, thanks for catching it! Removed.

On 2014/10/07 16:24:54, James Cook wrote:

+class InfoMap;
+}
+
 namespace net {
 class HostResolver;
 class MappedHostResolver;
@@ -40,9 +44,11 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
       net::NetLog* net_log);
 
   // net::URLRequestContextGetter implementation.
-  virtual net::URLRequestContext* GetURLRequestContext() override;
+  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;

[James Cook, 2014/10/07 16:24:54]

We're transitioning to C++11, this should be lower-case override.  You might
need to bypass a presubmit check -- I'm not sure if those are working correctly.

[Xi Han, 2014/10/07 19:29:53]

Updated.

On 2014/10/07 16:24:54, James Cook wrote:

   virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const override;
+      GetNetworkTaskRunner() const OVERRIDE;
+
+  virtual net::NetworkDelegate* CreateNetworkDelegate();

[James Cook, 2014/10/07 16:24:54]

brief comment please

[Xi Han, 2014/10/07 19:29:53]

Done.

 
   net::HostResolver* host_resolver();