Small cleanup for ChromeBrowserMain:

chrome/chrome_browser.gypi

 # Copyright 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 333 matching lines @@
         'browser/chrome_browser_field_trials.h',
         'browser/chrome_browser_field_trials_desktop.cc',
         'browser/chrome_browser_field_trials_desktop.h',
         'browser/chrome_browser_field_trials_mobile.cc',
         'browser/chrome_browser_field_trials_mobile.h',
         'browser/chrome_browser_main.cc',
         'browser/chrome_browser_main.h',
         'browser/chrome_browser_main_android.cc',
         'browser/chrome_browser_main_android.h',
         'browser/chrome_browser_main_extra_parts.h',
+        'browser/chrome_browser_main_extra_parts_x11.cc',
+        'browser/chrome_browser_main_extra_parts_x11.h',
         'browser/chrome_browser_main_linux.cc',
         'browser/chrome_browser_main_linux.h',
         'browser/chrome_browser_main_mac.h',
         'browser/chrome_browser_main_mac.mm',
         'browser/chrome_browser_main_posix.cc',
         'browser/chrome_browser_main_posix.h',
         'browser/chrome_browser_main_win.cc',
         'browser/chrome_browser_main_win.h',
-        'browser/chrome_browser_main_x11.cc',
-        'browser/chrome_browser_main_x11.h',
         'browser/chrome_content_browser_client.cc',
         'browser/chrome_content_browser_client.h',
         'browser/chrome_page_zoom.cc',
         'browser/chrome_page_zoom.h',
         'browser/chrome_page_zoom_constants.cc',
         'browser/chrome_page_zoom_constants.h',
         'browser/chrome_process_singleton.cc',
         'browser/chrome_process_singleton.h',
         'browser/chrome_quota_permission_context.cc',
         'browser/chrome_quota_permission_context.h',
@@ skipping 1874 matching lines @@
         'browser/thumbnails/thumbnail_service.h',
         'browser/thumbnails/thumbnail_service_factory.cc',
         'browser/thumbnails/thumbnail_service_factory.h',
         'browser/thumbnails/thumbnail_service_impl.cc',
         'browser/thumbnails/thumbnail_service_impl.h',
         'browser/thumbnails/thumbnail_tab_helper.cc',
         'browser/thumbnails/thumbnail_tab_helper.h',
         'browser/thumbnails/thumbnailing_algorithm.h',
         'browser/thumbnails/thumbnailing_context.cc',
         'browser/thumbnails/thumbnailing_context.h',
-        'browser/toolkit_extra_parts.h',
         'browser/translate/options_menu_model.cc',
         'browser/translate/options_menu_model.h',
         'browser/translate/page_translated_details.h',
         'browser/translate/translate_accept_languages.h',
         'browser/translate/translate_accept_languages.cc',
         'browser/translate/translate_browser_metrics.cc',
         'browser/translate/translate_browser_metrics.h',
         'browser/translate/translate_error_details.h',
         'browser/translate/translate_event_details.cc',
         'browser/translate/translate_event_details.h',
@@ skipping 1106 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }