Revert 110327 - Add ChromeBrowserParts for non main parts.

This reverts the code back to a single instance of BrowserMainParts, with auxillary parts (Gtk, Views, Aura, Touch) implemented from a new base class, ChromeBrowserParts, which has a Chrome specific interface, allowing initialization to be better subdivided.

This should fix the notifications auto tests.

BUG=103821
TEST=Make sure all tests and autotests run

Review URL: http://codereview.chromium.org/8539038

TBR=stevenjb@google.com
Review URL: http://codereview.chromium.org/8488015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110350 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 22 deletions

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index b2be37f..867b14c 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -9,7 +9,6 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/scoped_vector.h"
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/first_run/first_run.h"
@@ -18,7 +17,6 @@
 
 class BrowserInit;
 class BrowserProcessImpl;
-class ChromeBrowserMainExtraParts;
 class FieldTrialSynchronizer;
 class HistogramSynchronizer;
 class MetricsService;
@@ -45,14 +43,23 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
  public:
   virtual ~ChromeBrowserMainParts();
 
-  // Add additional ChromeBrowserMainExtraParts.
-  virtual void AddParts(ChromeBrowserMainExtraParts* parts);
+  // Constructs metrics service and does related initialization, including
+  // creation of field trials. Call only after labs have been converted to
+  // switches.
+  MetricsService* SetupMetricsAndFieldTrials(PrefService* local_state);
+
+  const content::MainFunctionParams& parameters() const {
+    return parameters_;
+  }
+  const CommandLine& parsed_command_line() const {
+    return parsed_command_line_;
+  }
 
  protected:
   explicit ChromeBrowserMainParts(
       const content::MainFunctionParams& parameters);
 
-  // content::BrowserMainParts overrides.
+  // content::BrowserParts overrides
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PostEarlyInitialization() OVERRIDE;
   virtual void ToolkitInitialized() OVERRIDE;
@@ -65,15 +72,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // Displays a warning message that we can't find any locale data files.
   virtual void ShowMissingLocaleMessageBox() = 0;
 
-  const content::MainFunctionParams& parameters() const {
-    return parameters_;
-  }
-  const CommandLine& parsed_command_line() const {
-    return parsed_command_line_;
-  }
-
-  Profile* profile() { return profile_; }
-
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------
 
@@ -106,11 +104,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
 
   // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
 
-  // Constructs metrics service and does related initialization, including
-  // creation of field trials. Call only after labs have been converted to
-  // switches.
-  MetricsService* SetupMetricsAndFieldTrials(PrefService* local_state);
-
   static MetricsService* InitializeMetrics(
       const CommandLine& parsed_command_line,
       const PrefService* local_state);
@@ -122,6 +115,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // Methods for Main Message Loop -------------------------------------------
 
   int PreMainMessageLoopRunImpl();
+  void StartBrowserOrUITask();
 
   // Members initialized on construction ---------------------------------------
 
@@ -143,9 +137,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // SetupMetricsAndFieldTrials is called.
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
-  // Vector of additional ChromeBrowserMainExtraParts.
-  ScopedVector<ChromeBrowserMainExtraParts> chrome_extra_parts_;
-
   // Members initialized after / released before main_message_loop_ ------------
 
   scoped_ptr<BrowserInit> browser_init_;