Add ChromeBrowserMainExtraParts for non main parts. (take 3)

content/browser/browser_main_loop.h

Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 0abe7e158f1dcd0fa7b533e4ba29af36d30bc5f6..d02d578595dd60ac5379801768b439a3f98e206c 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -6,8 +6,6 @@
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #pragma once
 
-#include <vector>
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -55,11 +53,6 @@ class BrowserMainLoop {
   const CommandLine& parsed_command_line_;
   int result_code_;
 
-  // Vector of BrowserMainParts set by CreateBrowserMainParts ------------------
-  // The BrowserParts fucntions for each part are called in the order added.
-  // They are released (destroyed) in the reverse order.
-  std::vector<BrowserMainParts*> parts_list_;
-
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
@@ -68,6 +61,13 @@ class BrowserMainLoop {
 #if defined(OS_WIN)
   scoped_ptr<SystemMessageWindowWin> system_message_window_;
 #endif
+
+  // Destroy parts_ before main_message_loop_ (required) and before other
+  // classes constructed in content (but after main_thread_).
+  scoped_ptr<BrowserMainParts> parts_;
+
+  // Members initialized in |InitializeMainThread()| ---------------------------
+  // This must get destroyed before other threads that are created in parts_.
   scoped_ptr<BrowserThreadImpl> main_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);