Remove "2" suffixes from options2 code.

chrome/browser_tests.isolate

 # 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.
 {
   'variables': {
     'isolate_dependency_tracked': [
       '../net/tools/testserver/asn1.py',
       '../net/tools/testserver/echo_message.py',
       '../net/tools/testserver/minica.py',
       '../net/tools/testserver/testserver.py',
@@ skipping 1556 matching lines @@
           '../third_party/python_26/Lib/xmlrpclib.py',
           '../third_party/python_26/Lib/zipfile.py',
           '../third_party/python_26/python.exe',
           '../third_party/python_26/python26.dll',
           '<(PRODUCT_DIR)/avcodec-54.dll',
           '<(PRODUCT_DIR)/avformat-54.dll',
           '<(PRODUCT_DIR)/avutil-51.dll',
           '<(PRODUCT_DIR)/icudt.dll',
           '<(PRODUCT_DIR)/plugins/npTestNetscapePlugIn.dll',
           '<(PRODUCT_DIR)/plugins/npapi_test_plugin.dll',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/autofill_options2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/browser_options2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/content_options2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/content_settings_exception_area2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/cookies_view2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/font_settings2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/language_options2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/options2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/password_manager2_browsertest.js',
-          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/search_engine_manager2_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/autofill_options_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/browser_options_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/content_options_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/content_settings_exception_area_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/cookies_view_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/font_settings_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/language_options_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/options_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/password_manager_browsertest.js',
+          '<(PRODUCT_DIR)/test_data/chrome/browser/ui/webui/options2/search_engine_manager_browsertest.js',
           '<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/hsts_view.js',
           'test/data/extensions/api_test/accessibility/get_alerts_for_tab/background.js',
           'test/data/extensions/api_test/accessibility/get_alerts_for_tab/manifest.json',
           'test/data/extensions/api_test/alert/manifest.json',
           'test/data/extensions/api_test/apitest/manifest.json',
           'test/data/extensions/api_test/background_scripts/manifest.json',
           'test/data/extensions/api_test/bindings/exception_in_handler_should_not_crash/manifest.json',
           'test/data/extensions/api_test/bookmark_manager/edit_disabled/manifest.json',
           'test/data/extensions/api_test/bookmark_manager/standard/manifest.json',
           'test/data/extensions/api_test/canvas_2d/manifest.json',
@@ skipping 130 matching lines @@
           'test/data/extensions/api_test/tabs/capture_visible_tab/common/black.html',
           'test/data/extensions/api_test/tabs/capture_visible_tab/common/tabs_util.js',
           'test/data/extensions/api_test/tabs/capture_visible_tab/common/white.html',
           'test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.html',
           'test/data/extensions/api_test/tabs/capture_visible_tab/test_jpeg.js',
         ],
       },
     }],
   ],
 }