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

tools/gritsettings/resource_ids

 # 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 is used to assign starting resource ids for resources and strings
 # used by Chromium.  This is done to ensure that resource ids are unique
 # across all the grd files.  If you are adding a new grd file, please add
 # a new entry to this file.
 #
 # The first entry in the file, SRCDIR, is special: It is a relative path from
@@ skipping 141 matching lines @@
   "devtools_resources.grd": {
     "includes": [22000],
   },
   # This file is generated during the build.
   "chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": {
     "includes": [22500],
   },
   "chrome/browser/resources/options_resources.grd": {
     "includes": [23000],
   },
-  "chrome/browser/resources/options2_resources.grd": {
+  "chrome/browser/resources/options_resources.grd": {
     "structures": [23200],
   },
   "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
     "messages": [23500],
   },
   "chrome/browser/resources/quota_internals_resources.grd": {
     "includes": [24000],
   },
   "content/content_resources.grd": {
     "includes": [25000],
   },
   "content/shell/shell_resources.grd": {
     "includes": [25500],
   },
   "ash/ash_strings.grd": {
     "messages": [26000],
   },
   "chrome/common/extensions_api_resources.grd": {
     "includes": [26500],
   },
   "third_party/trace-viewer/src/tracing.grd": {
     "includes": [27000],
   },
 }