Fix bug: AppShell: CHECK failure in PeerConnection init.

content/shell/browser/shell_url_request_context_getter.h

 // 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.
 
 #ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
 #define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job_factory.h"
 
 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;
 class NetworkDelegate;
 class NetLog;
 class ProxyConfigService;
 class URLRequestContextStorage;
 }
 
 namespace content {
 
 class ShellURLRequestContextGetter : public net::URLRequestContextGetter {
  public:
   ShellURLRequestContextGetter(
       bool ignore_certificate_errors,
       const base::FilePath& base_path,
       base::MessageLoop* io_loop,
       base::MessageLoop* file_loop,
       ProtocolHandlerMap* protocol_handlers,
       URLRequestInterceptorScopedVector request_interceptors,
       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();
 
  protected:
   virtual ~ShellURLRequestContextGetter();
 
  private:
   bool ignore_certificate_errors_;
   base::FilePath base_path_;
   base::MessageLoop* io_loop_;
   base::MessageLoop* file_loop_;
   net::NetLog* net_log_;
 
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_ptr<net::NetworkDelegate> network_delegate_;
   scoped_ptr<net::URLRequestContextStorage> storage_;
   scoped_ptr<net::URLRequestContext> url_request_context_;
   ProtocolHandlerMap protocol_handlers_;
   URLRequestInterceptorScopedVector request_interceptors_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellURLRequestContextGetter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_