Mac content shell: Fix new browser window.

content/shell/shell_browser_main_parts.cc

 // Copyright (c) 2012 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/shell_browser_main_parts.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
@@ skipping 40 matching lines @@
 
 MessageLoop* ShellBrowserMainParts::GetMainMessageLoop() {
   return NULL;
 }
 
 int ShellBrowserMainParts::PreCreateThreads() {
   return 0;
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
+  browser_context_.reset(new ShellBrowserContext(this));
+
   Shell::PlatformInitialize();
   net::NetModule::SetResourceProvider(Shell::PlatformResourceProvider);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kRemoteDebuggingPort)) {
     std::string port_str =
         command_line.GetSwitchValueASCII(switches::kRemoteDebuggingPort);
     int port;
     if (base::StringToInt(port_str, &port) && port > 0 && port < 65535) {
       devtools_delegate_ = new ShellDevToolsDelegate(
           port,
-          ShellBrowserContext::GetInstance()->GetRequestContext());
+          browser_context_->GetRequestContext());
     } else {
       DLOG(WARNING) << "Invalid http debugger port number " << port;
     }
   }
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
-    Shell::CreateNewWindow(ShellBrowserContext::GetInstance(),
+    Shell::CreateNewWindow(browser_context_.get(),
                            GetStartupURL(),
                            NULL,
                            MSG_ROUTING_NONE,
                            NULL);
   }
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
   if (devtools_delegate_)
     devtools_delegate_->Stop();
+  browser_context_.reset();
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   return false;
 }
 
 ui::Clipboard* ShellBrowserMainParts::GetClipboard() {
   if (!clipboard_.get())
     clipboard_.reset(new ui::Clipboard());
   return clipboard_.get();
 }
 
 }  // namespace