Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.

Revert 110741 - Fix ProcessSingletonTest.StartupRaceCondition for win.

    This was originally submitted as http://codereview.chromium.org/8539038/ which was reverted because of a failing test on win.

    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.

    This CL also addresses the test failure on win (and a test failure on linux_chromeos triggered by the windows fix).

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

TBR=stevenjb@chromium.org

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

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

1 files changed, 0 insertions, 44 deletions

diff --git a/chrome/browser/chrome_browser_main_extra_parts.h b/chrome/browser/chrome_browser_main_extra_parts.h
deleted file mode 100644
index a839d44..0000000
--- a/chrome/browser/chrome_browser_main_extra_parts.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// 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 CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_H_
-#define CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-
-// Interface class for Parts owned by ChromeBrowserMainParts.
-// The default implementation for all methods is empty.
-
-// Most of these map to content::BrowserMainParts methods. This interface is
-// separate to allow stages to be further subdivided for Chrome specific
-// initialization stages (e.g. browser process init, profile init).
-
-class ChromeBrowserMainExtraParts {
- public:
-  ChromeBrowserMainExtraParts();
-  virtual ~ChromeBrowserMainExtraParts();
-
-  // EarlyInitialization methods.
-  virtual void PreEarlyInitialization();
-  virtual void PostEarlyInitialization();
-
-  // PreMainMessageLoopStart methods.
-  virtual void PreMainMessageLoopStart();
-  virtual void PostMainMessageLoopStart();
-
-  // ToolkitInitialized methods.
-  virtual void ToolkitInitialized();
-
-  // MainMessageLoopRun methods.
-  virtual void PostBrowserProcessInit();
-  virtual void PostProfileInitialized();
-  virtual void PreMainMessageLoopRun();
-  virtual void PostMainMessageLoopRun();
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraParts);
-};
-
-#endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_H_