Options: Rename chrome/browser/resources/options2 -> chrome/browser/resources/options.

chrome/browser/resources/options2/options_bundle.js

Index: chrome/browser/resources/options2/options_bundle.js
diff --git a/chrome/browser/resources/options2/options_bundle.js b/chrome/browser/resources/options2/options_bundle.js
deleted file mode 100644
index 2bbd43d4791ea6f820be8d7e2644d7c5e303b16f..0000000000000000000000000000000000000000
--- a/chrome/browser/resources/options2/options_bundle.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// 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.
-//
-// This file exists to aggregate all of the javascript used by the
-// settings page into a single file which will be flattened and served
-// as a single resource.
-<include src="controlled_setting.js"></include>
-<include src="deletable_item_list.js"></include>
-<include src="editable_text_field.js"></include>
-<include src="inline_editable_list.js"></include>
-<include src="options_page.js"></include>
-<include src="preferences.js"></include>
-<include src="pref_ui.js"></include>
-<include src="settings_dialog.js"></include>
-<if expr="pp_ifdef('chromeos')">
-  <include src="../chromeos/user_images_grid.js"></include>
-  <include src="../shared/js/chromeos/ui_account_tweaks.js"></include>
-  <include src="chromeos/cellular_plan_element.js"></include>
-  <include src="chromeos/change_picture_options.js"></include>
-  <include src="chromeos/internet_detail_ip_address_field.js"></include>
-  <include src="chromeos/internet_detail.js"></include>
-  <include src="chromeos/network_list.js"></include>
-  <include src="chromeos/preferred_networks.js"></include>
-  <include src="chromeos/bluetooth_device_list.js"></include>
-  <include src="chromeos/bluetooth_add_device_overlay.js"></include>
-  <include src="chromeos/bluetooth_pair_device_overlay.js"></include>
-  <include src="chromeos/accounts_options.js"></include>
-  <include src="chromeos/proxy_rules_list.js"></include>
-  <include src="chromeos/accounts_user_list.js"></include>
-  <include src="chromeos/accounts_user_name_edit.js"></include>
-  <include src="chromeos/display_options.js"></include>
-  <include src="chromeos/keyboard_overlay.js"></include>
-  <include src="chromeos/pointer_overlay.js"></include>
-  var AccountsOptions = options.AccountsOptions;
-  var ChangePictureOptions = options.ChangePictureOptions;
-  var DetailsInternetPage = options.internet.DetailsInternetPage;
-  var DisplayOptions = options.DisplayOptions;
-  var BluetoothOptions = options.BluetoothOptions;
-  var BluetoothPairing = options.BluetoothPairing;
-  var KeyboardOverlay = options.KeyboardOverlay;
-  var PointerOverlay = options.PointerOverlay;
-  var UIAccountTweaks = uiAccountTweaks.UIAccountTweaks;
-</if>
-<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
-  <include src="chromeos/set_wallpaper_options.js"></include>
-  var SetWallpaperOptions = options.SetWallpaperOptions;
-</if>
-<if expr="pp_ifdef('use_nss')">
-  <include src="certificate_tree.js"></include>
-  <include src="certificate_manager.js"></include>
-  <include src="certificate_restore_overlay.js"></include>
-  <include src="certificate_backup_overlay.js"></include>
-  <include src="certificate_edit_ca_trust_overlay.js"></include>
-  <include src="certificate_import_error_overlay.js"></include>
-  var CertificateManager = options.CertificateManager;
-  var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
-  var CertificateBackupOverlay = options.CertificateBackupOverlay;
-  var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
-  var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
-</if>
-<include src="alert_overlay.js"></include>
-<include src="autofill_edit_address_overlay.js"></include>
-<include src="autofill_edit_creditcard_overlay.js"></include>
-<include src="autofill_options_list.js"></include>
-<include src="autofill_options.js"></include>
-<include src="browser_options.js"></include>
-<include src="browser_options_profile_list.js"></include>
-<include src="browser_options_startup_page_list.js"></include>
-<include src="clear_browser_data_overlay.js"></include>
-<include src="content_settings.js"></include>
-<include src="content_settings_exceptions_area.js"></include>
-<include src="content_settings_ui.js"></include>
-<include src="cookies_list.js"></include>
-<include src="cookies_view.js"></include>
-<include src="cookies_view_app.js"></include>
-<include src="font_settings.js"></include>
-<include src="handler_options.js"></include>
-<include src="handler_options_list.js"></include>
-<include src="home_page_overlay.js"></include>
-<include src="import_data_overlay.js"></include>
-<include src="instant_confirm_overlay.js"></include>
-<include src="language_add_language_overlay.js"></include>
-<include src="language_list.js"></include>
-<include src="language_options.js"></include>
-<include src="manage_profile_overlay.js"></include>
-<include src="media_galleries_list.js"></include>
-<include src="media_galleries_manager_overlay.js"></include>
-<include src="options_focus_manager.js"></include>
-<include src="password_manager.js"></include>
-<include src="password_manager_list.js"></include>
-<include src="profiles_icon_grid.js"></include>
-<include src="search_engine_manager.js"></include>
-<include src="search_engine_manager_engine_list.js"></include>
-<include src="search_page.js"></include>
-<include src="spelling_confirm_overlay.js"></include>
-<include src="startup_overlay.js"></include>
-<include src="../sync_setup_overlay.js"></include>
-<include src="../uber/uber_utils.js"></include>
-<include src="options.js"></include>