Mac content shell: Fix new browser window.

content/shell/shell_browser_context.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_context.h"
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/geolocation_permission_context.h"
 #include "content/public/browser/speech_recognition_preferences.h"
+#include "content/shell/shell_browser_main_parts.h"
 #include "content/shell/shell_download_manager_delegate.h"
 #include "content/shell/shell_resource_context.h"
 #include "content/shell/shell_url_request_context_getter.h"
 
 #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"
@@ skipping 49 matching lines @@
 
   virtual void SetFilterProfanities(bool filter_profanities) OVERRIDE {
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellSpeechRecognitionPreferences);
 };
 
 }  // namespace
 
-ShellBrowserContext* ShellBrowserContext::GetInstance() {
-  return Singleton<ShellBrowserContext>::get();
-}
-
-ShellBrowserContext::ShellBrowserContext() {
+ShellBrowserContext::ShellBrowserContext(
+    ShellBrowserMainParts* shell_main_parts)
+    : shell_main_parts_(shell_main_parts) {
   InitWhileIOAllowed();
 }
 
 ShellBrowserContext::~ShellBrowserContext() {
   if (resource_context_.get()) {
     BrowserThread::DeleteSoon(
       BrowserThread::IO, FROM_HERE, resource_context_.release());
   }
 }
 
@@ skipping 84 matching lines @@
 
 bool ShellBrowserContext::DidLastSessionExitCleanly()  {
   return true;
 }
 
 quota::SpecialStoragePolicy* ShellBrowserContext::GetSpecialStoragePolicy() {
   return NULL;
 }
 
 }  // namespace content