Small cleanup for ChromeBrowserMain:

chrome/browser/chrome_browser_main_extra_parts_x11.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.
 
 // Contains functions used by BrowserMain() that are gtk-specific.
 
-#ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_X11_H_
-#define CHROME_BROWSER_CHROME_BROWSER_MAIN_X11_H_
+#ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_X11_H_
+#define CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_X11_H_
 
-// Installs the X11 error handlers for the browser process used during
-// startup. They simply print error messages and exit because
-// we can't shutdown properly while creating and initializing services.
-void SetBrowserX11ErrorHandlersPreEarlyInitialization();
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/chrome_browser_main_extra_parts.h"
 
-// Installs the X11 error handlers for the browser process after the
-// main message loop has started. This will allow us to exit cleanly
-// if X exits before us.
-void SetBrowserX11ErrorHandlersPostMainMessageLoopStart();
+class ChromeBrowserMainExtraPartsX11 : public ChromeBrowserMainExtraParts {
+ public:
+  ChromeBrowserMainExtraPartsX11();
+  virtual ~ChromeBrowserMainExtraPartsX11();
 
-// Installs empty X11 error handlers. This avoids calling into the message-loop
-// in case an X11 erro happens while the message-loop is being destroyed.
-void UnsetBrowserX11ErrorHandlers();
+ private:
+  // ChromeBrowserMainExtraParts overrides.
+  virtual void PreEarlyInitialization() OVERRIDE;
+  virtual void PostMainMessageLoopStart() OVERRIDE;
+  virtual void PostMainMessageLoopRun() OVERRIDE;
 
-#endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_X11_H_
+  DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainExtraPartsX11);
+};
+
+#endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_EXTRA_PARTS_X11_H_