Content Shell: Introduce LayoutTestBrowserMainParts.

content/shell/browser/shell_browser_main_parts.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
 #define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
@@ skipping 10 matching lines @@
 }
 
 namespace net {
 class NetLog;
 }
 
 namespace content {
 
 class ShellBrowserContext;
 class ShellDevToolsDelegate;
-class ShellPluginServiceFilter;
 
 class ShellBrowserMainParts : public BrowserMainParts {
  public:
   explicit ShellBrowserMainParts(const MainFunctionParams& parameters);
   virtual ~ShellBrowserMainParts();
 
   // BrowserMainParts overrides.
   virtual void PreEarlyInitialization() override;
   virtual void PreMainMessageLoopStart() override;
   virtual void PostMainMessageLoopStart() override;
   virtual void PreMainMessageLoopRun() override;
   virtual bool MainMessageLoopRun(int* result_code) override;
   virtual void PostMainMessageLoopRun() override;
 
   ShellDevToolsDelegate* devtools_delegate() {
     return devtools_delegate_.get();
   }
 
   ShellBrowserContext* browser_context() { return browser_context_.get(); }
   ShellBrowserContext* off_the_record_browser_context() {
     return off_the_record_browser_context_.get();
   }
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_