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

chrome/browser/resources/web_dev_style/js_checker.py

 # 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.
 
 """Presubmit script for Chromium JS resources.
 
 See chrome/browser/resources/PRESUBMIT.py
 """
 
 class JSChecker(object):
@@ skipping 61 matching lines @@
     # resources/ we can get rid of this function.
     path = self.input_api.os_path
     resources = self.input_api.PresubmitLocalPath()
     dirs = (
         path.join(resources, 'extensions'),
         path.join(resources, 'help'),
         path.join(resources, 'history'),
         path.join(resources, 'net_internals'),
         path.join(resources, 'network_action_predictor'),
         path.join(resources, 'ntp4'),
-        path.join(resources, 'options2'),
+        path.join(resources, 'options'),
         path.join(resources, 'print_preview'),
         path.join(resources, 'profiler'),
         path.join(resources, 'sync_promo'),
         path.join(resources, 'tracing'),
         path.join(resources, 'uber'),
     )
     if filename.startswith(dirs):
       return self.output_api.PresubmitError(error_text)
     else:
       return self.output_api.PresubmitPromptWarning(error_text)
@@ skipping 114 matching lines @@
             '\n'.join(error_lines), f.AbsoluteLocalPath()))
 
     if results:
       results.append(self.output_api.PresubmitNotifyResult(
           'See the JavaScript style guide at '
           'http://www.chromium.org/developers/web-development-style-guide'
           '#TOC-JavaScript and if you have any feedback about the JavaScript '
           'PRESUBMIT check, contact tbreisacher@chromium.org'))
 
     return results