Content Shell: Introduce LayoutTestBrowserMainParts.

content/shell/browser/shell_browser_main_parts.h

Index: content/shell/browser/shell_browser_main_parts.h
diff --git a/content/shell/browser/shell_browser_main_parts.h b/content/shell/browser/shell_browser_main_parts.h
index 3d63cc0c7b225fe287e577871ec1365e60ae484f..cc9b9879eb0981325636440861881b4040c92b79 100644
--- a/content/shell/browser/shell_browser_main_parts.h
+++ b/content/shell/browser/shell_browser_main_parts.h
@@ -28,7 +28,6 @@ namespace content {
 
 class ShellBrowserContext;
 class ShellDevToolsDelegate;
-class ShellPluginServiceFilter;
 
 class ShellBrowserMainParts : public BrowserMainParts {
  public:
@@ -54,22 +53,24 @@ class ShellBrowserMainParts : public BrowserMainParts {
 
   net::NetLog* net_log() { return net_log_.get(); }
 
+ protected:
+  virtual void InitializeBrowserContexts();
+  virtual void InitializeMessageLoopContext();
+
+  scoped_ptr<ShellBrowserContext> browser_context_;

[jochen (gone - plz use gerrit), 2014/10/13 08:01:49]

can you add a protected getter/setter instead?

[Mike West, 2014/10/13 09:52:26]

Sure.

+  scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;

[jochen (gone - plz use gerrit), 2014/10/13 08:01:49]

i'm somewhat surprised that the layout tests should need OTR profiles?

[Mike West, 2014/10/13 09:52:25]

It's not clear that they do.

That said, I think it would be more surprising to create a
LayoutTestBrowserContext for the recorded context, and a ShellBrowserContext for
the OTR context. *shrug* I don't feel at all strongly about it, though. If you'd
like me to drop that assignment, I'll certainly do it.

+
  private:
 #if defined(OS_ANDROID)
   scoped_ptr<breakpad::CrashDumpManager> crash_dump_manager_;
 #endif
   scoped_ptr<net::NetLog> net_log_;
-  scoped_ptr<ShellBrowserContext> browser_context_;
-  scoped_ptr<ShellBrowserContext> off_the_record_browser_context_;
 
   // For running content_browsertests.
   const MainFunctionParams parameters_;
   bool run_message_loop_;
 
   scoped_ptr<ShellDevToolsDelegate> devtools_delegate_;
-#if defined(ENABLE_PLUGINS)
-  scoped_ptr<ShellPluginServiceFilter> plugin_service_filter_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(ShellBrowserMainParts);
 };