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 {
 
+namespace {
+
+bool IgnoreCertificateErrors() {
+  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  if (cmd_line->HasSwitch(::switches::kIgnoreCertificateErrors) ||

[James Cook, 2014/10/07 22:38:45]

no need for an if(), just return the result of the expression

[Xi Han, 2014/10/08 13:48:48]

Done.

+      cmd_line->HasSwitch(switches::kDumpRenderTree))

[James Cook, 2014/10/07 22:38:45]

You don't need kDumpRenderTree. We're not going to use that in app_shell.  Just
get rid of it and eliminate the #include

[Xi Han, 2014/10/08 13:48:48]

Done.

+    return true;
+  return false;
+
+}
+
+}  // namespace
+
 // 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) {
-  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(::switches::kIgnoreCertificateErrors) ||
-      cmd_line->HasSwitch(switches::kDumpRenderTree)) {
-    ignore_certificate_errors_ = true;
-  }
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
 }
 
 content::BrowserPluginGuestManager* ShellBrowserContext::GetGuestManager() {
   return GuestViewManager::FromBrowserContext(this);
 }
 
 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(!url_request_context_getter());
+  bool ignore_certificate_errors = IgnoreCertificateErrors();
+  set_url_request_context_getter(
+      new ShellURLRequestContextGetter(
           this,
-          ignore_certificate_errors_,
+          ignore_certificate_errors,

[James Cook, 2014/10/07 22:38:45]

just call IgnoreCertificateErrors() here

[Xi Han, 2014/10/08 13:48:48]

Removed.

           GetPath(),
           content::BrowserThread::UnsafeGetMessageLoopForThread(
               content::BrowserThread::IO),
           content::BrowserThread::UnsafeGetMessageLoopForThread(
               content::BrowserThread::FILE),
           protocol_handlers,
           request_interceptors.Pass(),
           net_log_,
-          extension_info_map);
-  Init();
-  return url_request_context_getter_.get();
-}
-
-void ShellBrowserContext::Init(){
-  content:: BrowserThread:: PostTask(
+          extension_info_map));
+  resource_context_->set_url_request_context_getter(
+      url_request_context_getter());
+  content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(
-          &ShellBrowserContext::InitializationOnIOThread,
+          &ShellBrowserContext::InitURLRequestContextOnIOThread,
           base::Unretained(this)));
+  return url_request_context_getter();
 }
 
-void ShellBrowserContext::InitializationOnIOThread() {
+void ShellBrowserContext::InitURLRequestContextOnIOThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
 
-  url_request_context_getter_->GetURLRequestContext();
+  // GetURLRequestContext() will create a URLRequestContext if it isn't
+  // initialized.
+  url_request_context_getter()->GetURLRequestContext();
 }
 
 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