| Index: content/shell/shell_browser_context.cc
|
| diff --git a/content/shell/shell_browser_context.cc b/content/shell/shell_browser_context.cc
|
| index dbf6445872950334820a05e8ee5a4a037d002d42..476586069fd2dbfbe50e61c547338b2155f3ff08 100644
|
| --- a/content/shell/shell_browser_context.cc
|
| +++ b/content/shell/shell_browser_context.cc
|
| @@ -14,6 +14,7 @@
|
| #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"
|
| @@ -83,11 +84,9 @@ class ShellSpeechRecognitionPreferences : public SpeechRecognitionPreferences {
|
|
|
| } // namespace
|
|
|
| -ShellBrowserContext* ShellBrowserContext::GetInstance() {
|
| - return Singleton<ShellBrowserContext>::get();
|
| -}
|
| -
|
| -ShellBrowserContext::ShellBrowserContext() {
|
| +ShellBrowserContext::ShellBrowserContext(
|
| + ShellBrowserMainParts* shell_main_parts)
|
| + : shell_main_parts_(shell_main_parts) {
|
| InitWhileIOAllowed();
|
| }
|
|
|
|
|