[uber page] Merge advanced options page into browser options.

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 4110 matching lines @@
         'browser/ui/webui/options/pack_extension_handler.h',
         'browser/ui/webui/options/pack_extension_handler.cc',
         'browser/ui/webui/options/personal_options_handler.cc',
         'browser/ui/webui/options/personal_options_handler.h',
         'browser/ui/webui/options/search_engine_manager_handler.cc',
         'browser/ui/webui/options/search_engine_manager_handler.h',
         'browser/ui/webui/options/stop_syncing_handler.cc',
         'browser/ui/webui/options/stop_syncing_handler.h',
         'browser/ui/webui/options/web_intents_settings_handler.cc',
         'browser/ui/webui/options/web_intents_settings_handler.h',
-        'browser/ui/webui/options2/advanced_options_handler2.cc',
-        'browser/ui/webui/options2/advanced_options_handler2.h',
         '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',
@@ skipping 1486 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' ]
     },
   ],
 }