Fix bug: AppShell: CHECK failure in PeerConnection init.

extensions/shell/browser/shell_browser_context.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_browser_context.h"
 
 #include "base/command_line.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
-#include "extensions/browser/extension_network_delegate.h"
-#include "extensions/browser/extension_url_request_context_getter.h"
+#include "content/shell/common/shell_switches.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
-#include "extensions/common/switches.h"
+#include "extensions/shell/browser/shell_network_delegate.h"
 #include "extensions/shell/browser/shell_special_storage_policy.h"
+#include "extensions/shell/browser/shell_url_request_context_getter.h"
 
 namespace extensions {
 
 // Create a normal recording browser context. If we used an incognito context
 // then app_shell would also have to create a normal context and manage both.
 ShellBrowserContext::ShellBrowserContext(net::NetLog* net_log)
     : content::ShellBrowserContext(false, NULL),
       net_log_(net_log),
       ignore_certificate_errors_(false),
       storage_policy_(new ShellSpecialStoragePolicy) {
@@ skipping 12 matching lines @@
 }
 
 storage::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
   return storage_policy_.get();
 }
 
 net::URLRequestContextGetter* ShellBrowserContext::CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors,
       InfoMap* extension_info_map) {
-  DCHECK(!url_request_context_getter_.get());
-  url_request_context_getter_ =
-      new extensions::ExtensionURLRequestContextGetter(
+  DCHECK(!get_url_request_context_getter());
+  extensions::ShellURLRequestContextGetter* url_request_context_getter =
+      new extensions::ShellURLRequestContextGetter(
           this,
           ignore_certificate_errors_,
           GetPath(),
           content::BrowserThread::UnsafeGetMessageLoopForThread(
               content::BrowserThread::IO),
           content::BrowserThread::UnsafeGetMessageLoopForThread(
               content::BrowserThread::FILE),
           protocol_handlers,
           request_interceptors.Pass(),
           net_log_,
           extension_info_map);
+  set_url_request_context_getter(url_request_context_getter);
   Init();
-  return url_request_context_getter_.get();
+  return get_url_request_context_getter();
 }
 
 void ShellBrowserContext::Init(){
   content:: BrowserThread:: PostTask(

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

formatting

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

Done.

       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(
           &ShellBrowserContext::InitializationOnIOThread,
           base::Unretained(this)));
 }
 
 void ShellBrowserContext::InitializationOnIOThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
-  url_request_context_getter_->GetURLRequestContext();
+  get_url_request_context_getter()->GetURLRequestContext();

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

This needs a comment explaining that GetURLRequestContext() has the side-effect
of creating the context.

These initialization functions seem really weird to me.  Init() isn't really
needed.  Also "Init()" implies the whole class is being initialized.  I would:

Eliminate Init().
Rename InitializationOnIOThread() to InitURLRequestContextOnIOThread() or
something similar to make it clear that's the only piece being initialized.

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

Remove Init() and rename.

 }
 
 void ShellBrowserContext::ProfileFunctionCallOnNonProfileBrowserContext1() {
   NOTREACHED();
 }
 void ShellBrowserContext::ProfileFunctionCallOnNonProfileBrowserContext2() {
   NOTREACHED();
 }
 void ShellBrowserContext::ProfileFunctionCallOnNonProfileBrowserContext3() {
   NOTREACHED();
@@ skipping 29 matching lines @@
   NOTREACHED();
 }
 void ShellBrowserContext::ProfileFunctionCallOnNonProfileBrowserContext14() {
   NOTREACHED();
 }
 void ShellBrowserContext::ProfileFunctionCallOnNonProfileBrowserContext15() {
   NOTREACHED();
 }
 
 }  // namespace extensions