Revert 117136 - separate about page into its own page (included in chrome://chrome)

chrome/chrome_browser.gypi

 # Copyright (c) 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 3685 matching lines @@
         'browser/ui/views/user_data_dir_dialog.h',
         'browser/ui/views/web_intent_picker_view.cc',
         'browser/ui/views/window.cc',
         'browser/ui/views/window.h',
         'browser/ui/views/wrench_menu.cc',
         'browser/ui/views/wrench_menu.h',
         'browser/ui/virtual_keyboard/virtual_keyboard_manager.cc',
         'browser/ui/virtual_keyboard/virtual_keyboard_manager.h',
         'browser/ui/web_applications/web_app_ui.cc',
         'browser/ui/web_applications/web_app_ui.h',
-        'browser/ui/webui/about_page/about_page_handler.cc',
-        'browser/ui/webui/about_page/about_page_handler.h',
-        'browser/ui/webui/about_page/about_page_ui.cc',
-        'browser/ui/webui/about_page/about_page_ui.h',
         'browser/ui/webui/about_ui.cc',
         'browser/ui/webui/about_ui.h',
         'browser/ui/webui/active_downloads_ui.cc',
         'browser/ui/webui/active_downloads_ui.h',
         'browser/ui/webui/aura/app_list_ui_delegate.h',
         'browser/ui/webui/aura/app_list_ui.cc',
         'browser/ui/webui/aura/app_list_ui.h',
         'browser/ui/webui/bookmarks_ui.cc',
         'browser/ui/webui/bookmarks_ui.h',
         'browser/ui/webui/feedback_ui.cc',
@@ skipping 244 matching lines @@
         'browser/ui/webui/options2/advanced_options_utils2.h',
         'browser/ui/webui/options2/advanced_options_utils2_mac.mm',
         'browser/ui/webui/options2/advanced_options_utils2_win.cc',
         'browser/ui/webui/options2/advanced_options_utils2_x11.cc',
         'browser/ui/webui/options2/autofill_options_handler2.cc',
         'browser/ui/webui/options2/autofill_options_handler2.h',
         'browser/ui/webui/options2/browser_options_handler2.cc',
         'browser/ui/webui/options2/browser_options_handler2.h',
         'browser/ui/webui/options2/certificate_manager_handler2.cc',
         'browser/ui/webui/options2/certificate_manager_handler2.h',
+        'browser/ui/webui/options2/chromeos/about_page_handler2.cc',
+        'browser/ui/webui/options2/chromeos/about_page_handler2.h',
         'browser/ui/webui/options2/chromeos/accounts_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/accounts_options_handler2.h',
         'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/bluetooth_options_handler2.h',
         'browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/change_picture_options_handler2.h',
         'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.h',
         'browser/ui/webui/options2/chromeos/cros_language_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/cros_language_options_handler2.h',
@@ skipping 269 matching lines @@
             ['exclude', 'browser/policy/network_configuration_updater.h'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
             ['exclude', 'browser/ui/toolbar/wrench_menu_model_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_tray_chromeos.h'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.cc'],
             ['exclude', 'browser/ui/views/status_icons/status_icon_chromeos.h'],
-            ['exclude', 'browser/ui/webui/about_page/about_page_handler.cc'],
-            ['exclude', 'browser/ui/webui/about_page/about_page_handler.h'],
-            ['exclude', 'browser/ui/webui/about_page/about_page_ui.cc'],
-            ['exclude', 'browser/ui/webui/about_page/about_page_ui.h'],
             ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
             ['exclude', 'browser/ui/webui/fileicon_source_chromeos.cc'],
             ['exclude', 'browser/ui/webui/fileicon_source_chromeos.h'],
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
@@ skipping 1148 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }