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

chrome/browser/resources/options/controlled_setting.js

 // 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.
 
 cr.define('options', function() {
   var Preferences = options.Preferences;
 
   /**
    * A controlled setting indicator that can be placed on a setting as an
    * indicator that the value is controlled by some external entity such as
@@ skipping 118 matching lines @@
    */
   cr.defineProperty(ControlledSettingIndicator, 'controlledBy',
                     cr.PropertyKind.ATTR,
                     ControlledSettingIndicator.prototype.close);
 
   // Export.
   return {
     ControlledSettingIndicator: ControlledSettingIndicator
   };
 });