Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.

chrome/browser/chrome_browser_parts_aura.cc

Index: chrome/browser/chrome_browser_parts_aura.cc
diff --git a/chrome/browser/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/chrome_browser_parts_aura.cc
similarity index 51%
rename from chrome/browser/chrome_browser_main_extra_parts_aura.cc
rename to chrome/browser/chrome_browser_parts_aura.cc
index ea5214f114c8178cc806b6695e65fff237d9af85..a2907e15611084e1a90330d84b716245dd5ff1a2 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/chrome_browser_parts_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
+#include "chrome/browser/chrome_browser_parts_aura.h"
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura_shell/shell.h"
@@ -11,11 +11,26 @@
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
-ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura()
-    : ChromeBrowserMainExtraParts() {
+ChromeBrowserPartsAura::ChromeBrowserPartsAura()
+    : content::BrowserMainParts() {
 }
 
-void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() {
+void ChromeBrowserPartsAura::PreEarlyInitialization() {
+}
+
+void ChromeBrowserPartsAura::PostEarlyInitialization() {
+}
+
+void ChromeBrowserPartsAura::ToolkitInitialized() {
+}
+
+void ChromeBrowserPartsAura::PreMainMessageLoopStart() {
+}
+
+void ChromeBrowserPartsAura::PostMainMessageLoopStart() {
+}
+
+void ChromeBrowserPartsAura::PreMainMessageLoopRun() {
 #if defined(OS_CHROMEOS)
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS())
     aura::Desktop::set_use_fullscreen_host_window(true);
@@ -24,3 +39,10 @@ void ChromeBrowserMainExtraPartsAura::PostBrowserProcessInit() {
   // Shell takes ownership of ChromeShellDelegate.
   aura_shell::Shell::CreateInstance(new ChromeShellDelegate);
 }
+
+bool ChromeBrowserPartsAura::MainMessageLoopRun(int* result_code) {
+  return false;
+}
+
+void ChromeBrowserPartsAura::PostMainMessageLoopRun() {
+}