Refactor some more BrowserMain code. Move core code that's required by all embedders to content.

content/browser/browser_main.h

 // Copyright (c) 2011 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_BROWSER_BROWSER_MAIN_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 55 matching lines @@
 //    method with a well-defined purpose. (Likewise, if you're adding to an
 //    existing chunk which makes it longer than one or two lines, please move
 //    the code out into a separate method.)
 class BrowserMainParts {
  public:
   explicit BrowserMainParts(const MainFunctionParams& parameters);
   virtual ~BrowserMainParts();
 
   // Parts to be called by |BrowserMain()|.
   void EarlyInitialization();
+  void InitializeToolkit();
   void MainMessageLoopStart();
-  void InitializeToolkit();
+  void MainMessageLoopRunWrapper();

[tony, 2011/09/08 17:21:04]

Nit: I would probably name this RunMainMessageLoopParts or something.  Wrapper
isn't very descriptive.

[jam, 2011/09/08 17:43:01]

Done.

 
-  // Temporary function since not all the code from chrome is moved over yet.
-  virtual int TemporaryContinue();
+  int result_code() const { return result_code_; }
 
  protected:
   // Methods to be overridden to provide platform-specific code; these
   // correspond to the "parts" above.
   virtual void PreEarlyInitialization();
   virtual void PostEarlyInitialization();
   virtual void PreMainMessageLoopStart();
   virtual void PostMainMessageLoopStart();
-
-  // Used to initialize NSPR where appropriate.
-  virtual void InitializeSSL();
+  virtual void PreMainMessageLoopRun();
+  virtual void MainMessageLoopRun();
+  virtual void PostMainMessageLoopRun();
 
   // Allows an embedder to do any extra toolkit initialization.
   virtual void ToolkitInitialized();
 
   // Accessors for data members (below) ----------------------------------------
   const MainFunctionParams& parameters() const {
     return parameters_;
   }
   const CommandLine& parsed_command_line() const {
     return parsed_command_line_;
   }
   MessageLoop& main_message_loop() const {
     return *main_message_loop_;
   }
+  void set_result_code(int result_code) { result_code_ = result_code; }
 
  private:
   void InitializeMainThread();
 
   // Members initialized on construction ---------------------------------------
 
   const MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
+  int result_code_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<BrowserThread> main_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainParts);
 };
 
 // Perform platform-specific work that needs to be done after the main event
 // loop has ended. The embedder must be sure to call this.
 // TODO(jam): change this so that content calls it so that we don't depend on
 // the embedder.
 void DidEndMainMessageLoop();
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_H_