Fix bug: AppShell: CHECK failure in PeerConnection init.

content/shell/browser/shell_browser_context.cc

 // 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.
 
 #include "content/shell/browser/shell_browser_context.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/files/file_util.h"
@@ skipping 11 matching lines @@
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #elif defined(OS_LINUX)
 #include "base/nix/xdg_util.h"
 #elif defined(OS_MACOSX)
 #include "base/base_paths_mac.h"
 #endif
 
 namespace content {
 
 class ShellBrowserContext::ShellResourceContext : public ResourceContext {

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

Another way to solve this problem would be to move the declaration of
ShellResourceContext into the header file (public or protected) and make
resource_context_ protected. This would let extensions::ShellBrowserContext call
set_url_request_context_getter() on it.

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

Done.

  public:
   ShellResourceContext() : getter_(NULL) {}
   virtual ~ShellResourceContext() {}
 
   // ResourceContext implementation:
   virtual net::HostResolver* GetHostResolver() override {
     CHECK(getter_);
     return getter_->host_resolver();
   }
   virtual net::URLRequestContext* GetRequestContext() override {
@@ skipping 79 matching lines @@
     CommandLine* cmd_line = CommandLine::ForCurrentProcess();
     if (cmd_line->HasSwitch(switches::kDumpRenderTree)) {
       download_manager_delegate_->SetDownloadBehaviorForTesting(
           path_.Append(FILE_PATH_LITERAL("downloads")));
     }
   }
 
   return download_manager_delegate_.get();
 }
 
+void ShellBrowserContext::set_url_request_context_getter(

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

Change it to a regular inline setter function and move it to the header file.

+    ShellURLRequestContextGetter* getter) {
+  url_request_getter_ = getter;
+  resource_context_->set_url_request_context_getter(url_request_getter_.get());
+}
+
+ShellURLRequestContextGetter*
+ShellBrowserContext::get_url_request_context_getter() {

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

Change it to a regular inline getter function and move it to the header file.

+  return url_request_getter_.get();
+}
+
 net::URLRequestContextGetter* ShellBrowserContext::GetRequestContext()  {
   return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
 
 net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
     ProtocolHandlerMap* protocol_handlers,
     URLRequestInterceptorScopedVector request_interceptors) {
   DCHECK(!url_request_getter_.get());
   url_request_getter_ = new ShellURLRequestContextGetter(

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

It you decide to go the SetURLRequestContextGetter() route, this code should
call it.

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

I adopt your suggestion to declare resource_context_ as protected, so the
extensions::ShellBrowserContext can use it directly. In this way, maybe we don't
need this SetURLRequestContextGetter() function, and still sets
resource_context_ and url_request_getter_ separately. I keep the
set_url_request_context_getter() and get_url_request_context_getter() as regular
setter and getter and make them as inline functions. 


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

       ignore_certificate_errors_,
       GetPath(),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO),
       BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::FILE),
       protocol_handlers,
       request_interceptors.Pass(),
       net_log_);
   resource_context_->set_url_request_context_getter(url_request_getter_.get());
   return url_request_getter_.get();
 }
@@ skipping 45 matching lines @@
 
 PushMessagingService* ShellBrowserContext::GetPushMessagingService() {
   return NULL;
 }
 
 SSLHostStateDelegate* ShellBrowserContext::GetSSLHostStateDelegate() {
   return NULL;
 }
 
 }  // namespace content