Update WATCHLIST to point to ui/views/* instead of views/*

WATCHLISTS

 # Copyright (c) 2011 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.
 
 # Watchlist Rules
 # Refer: http://dev.chromium.org/developers/contributing-code/watchlists
 
 
 {
   'WATCHLIST_DEFINITIONS': {
     'this_file': {
       'filepath': '^WATCHLISTS$',
     },
     'valgrind': {
       'filepath': 'valgrind',
     },
     'mac': {
       'filepath': 'cocoa|\.mm$|(_mac|_posix)\.(cc|h)$',
     },
     'base': {
       'filepath': '^base/.*',
     },
     'extension': {
       'filepath': 'extension',
     },
     'views': {
       # Applies to all files and subdirs within this directory.
-      'filepath': '^views/.*|'\
-                  '^ui/views/.*',
+      'filepath': '^ui/views/.*',
     },
     'aura': {
       'filepath': 'ui/aura/.*|'\
                   'ui/aura_shell/.*',
     },
     'views_core': {
-      'filepath': 'views/view.h|'\
-                  'views/view.cc|'\
-                  'views/widget/.*',
+      'filepath': 'ui/views/view.h|'\
+                  'ui/views/view.cc|'\
+                  'ui/views/widget/.*',
     },
     'browser': {
       'filepath': 'chrome/browser/.*',
     },
     'browser_main': {
       'filepath': 'chrome/browser/browser_main.cc',
     },
     'browser_resources': {
       'filepath': 'chrome/browser/resources/.*',
     },
     'bubble': {
-      'filepath': 'views/bubble/.*|'\
+      'filepath': 'ui/views/bubble/.*|'\
                   'chrome/browser/ui/views/bubble/.*',
     },
     'chromeos_login': {
       'filepath': 'chrome/browser/chromeos/login/.*|'\
                   'chrome/browser/ui/webui/chromeos/login/.*|'\
                   'chrome/browser/resources/chromeos/login/.*',
     },
     'content': {
       'filepath': 'content/.*',
     },
@@ skipping 59 matching lines @@
       'filepath': 'media/.*|third_party/(ffmpeg|openmax)/.*|webmediaplayer|'\
         'audio_message_filter|video_layer',
     },
     'ipc': {
       'filepath': 'ipc/ipc.*',
     },
     'linux-sandboxing': {
       'filepath': 'sandbox/linux/.*',
     },
     'sync': {
-      'filepath': 'chrome/browser/sync/.*|chrome/browser/views/sync/.*',
+      'filepath': 'chrome/browser/sync/.*',
     },
     'layout_tests': {
       'filepath': 'webkit/(tools|data)/(layout_tests|test_shell)/.*',
     },
     'tools': {
       'filepath': 'tools/.*',
     },
     'tests': {
       'filepath': 'apitest|unittest|browsertest|uitest|chrome/test/.*',
     },
     'automation': {
       'filepath': 'chrome/browser/automation/.*|chrome/test/automation/.*',
     },
     'chrome_frame': {
       'filepath': 'chrome_frame/.*',
     },
     'nacl': {
       'filepath': 'chrome/nacl/.*|chrome/test/nacl/.*|'\
         'chrome/browser/nacl_host/.*|chrome/common/nacl.*',
     },
     'appcache': {
       'filepath': 'appcache/.*',
     },
     'gpu': {
       'filepath': 'gpu/.*',
     },
     'locale_settings': {
       'filepath': 'chrome/app/resources/locale_settings.*',
     },
-    'options_dialog_content': {
-      'filepath': 'chrome/browser/views/options/content_page_view.h|'\
-        'chrome/browser/views/options/general_page_view.h',
-    },
     'chromeos': {
       'filepath': 'chrome/browser/chromeos/.*',
     },
     'chromeos_webui': {
       'filepath': 'chrome/browser/ui/webui/chromeos/.*|'\
                   'chrome/browser/resources/chromeos/.*',
     },
     'npapi_headers': {
       'filepath': 'third_party/npapi/bindings/.*',
     },
     'remoting': {
       'filepath': 'remoting/.*',
     },
     'domui_options': {
       'filepath': 'chrome/browser/resources/options/.*|'\
                   'chrome/browser/resources/options.html|'\
-                  'chrome/browser/dom_ui/options/.*',
+                  'chrome/browser/ui/webui/options/.*',
     },
     'ntp': {
       'filepath': 'chrome/browser/resources/ntp/.*|'\
         'chrome/browser/resources/ntp4/.*|'\
         'chrome/browser/resources/touch_ntp/.*|'\
         'chrome/browser/resources/touch_ntp/.*|'\
         'chrome/browser/ui/webui/ntp/.*',
     },
     'cookie_monster': {
       'filepath': 'net/base/cookie_.*|'\
@@ skipping 77 matching lines @@
                   '|chrome/browser/chromeos/'\
                   'xinput_hierarchy_changed_event_listener\..*' \
                   '|chrome/browser/chromeos/wm_.*' \
                   '|ui/base/x/.*'
     },
     'accessibility': {
       'filepath': 'chrome/browser/accessibility/.*' \
                   '|content/browser/accessibility/.*' \
                   '|chrome/.*accessib.*' \
                   '|ui/base/accessibility/.*' \
-                  '|views/accessibility/.*'
+                  '|ui/views/accessibility/.*'
     },
     'tools_emacs': {
       'filepath': 'tools/emacs/.*',
     },
     'browser_compositor': {
       'filepath': 'ui/gfx/compositor/.*'
     },
     'browser_gl': {
       'filepath': 'ui/gfx/gl/.*'
     },
     'textinput': {
       'filepath': 'content/browser/renderer_host/gtk_im.*'\
                   '|content/browser/renderer_host/gtk_key.*'\
                   '|content/browser/renderer_host/render_widget_host_view.*'\
                   '|content/browser/renderer_host/text_input.*'\
                   '|ui/base/ime/.*'\
                   '|ui/base/gtk/event.*'\
                   '|ui/base/gtk/gtk_im.*'\
                   '|ui/base/keycodes/.*'\
                   '|ui/base/win/ime.*'\
-                  '|ui/views/ime/.*'\
-                  '|views/controls/textfield/.*'
+                  '|ui/views/controls/textfield/.*'\
+                  '|ui/views/ime/.*'
     },
     'textinput_chromeos': {
       'filepath': 'chrome/browser/chromeos/input_method/.*'\
                   '|chrome/browser/chromeos/extensions/input_method.*'\
                   '|chrome/browser/chromeos/status/input_method.*'\
                   '|chrome/browser/extensions/extension_input_.*'\
                   '|chrome/browser/resources/keyboard.*'\
                   '|chrome/browser/resources/options/language.*'\
                   '|chrome/browser/ui/webui/options/'\
                   'chromeos/.*(language|keyboard).*'\
@@ skipping 53 matching lines @@
              'akalin@chromium.org', 'rsimha@chromium.org'],
     'tools': ['pam+watch@chromium.org'],
     'tests': ['phajdan.jr@chromium.org'],
     'automation': ['phajdan.jr@chromium.org', 'kkania@chromium.org',
                    'robertshield@chromium.org'],
     'chrome_frame': ['amit@chromium.org', 'robertshield@chromium.org'],
     'nacl': ['native-client-reviews@googlegroups.com'],
     'appcache': ['michaeln@chromium.org'],
     'gpu': ['apatrick@chromium.org'],
     'locale_settings': ['finnur+watch@chromium.org'],
-    'options_dialog_content': ['finnur+watch@chromium.org'],
     'chromeos': ['davemoore+watch@chromium.org', 'stevenjb+watch@chromium.org',
                  'nkostylev+watch@chromium.org'],
     'chromeos_webui': ['nkostylev+watch@chromium.org'],
     'npapi_headers': ['stuartmorgan@chromium.org'],
     'remoting': ['garykac+watch@chromium.org',
                  'hclam+watch@chromium.org',
                  'jamiewalch+watch@chromium.org',
                  'lambroslambrou+watch@chromium.org',
                  'sergeyu+watch@chromium.org',
                  'simonmorris+watch@chromium.org',
@@ skipping 51 matching lines @@
     'browser_gl': ['dhollowa+watch@chromium.org'],
     'textinput': ['penghuang+watch@chromium.org',
                   'suzhe@chromium.org',
                   'yusukes+watch@chromium.org'],
     'textinput_chromeos': ['yusukes+watch@chromium.org'],
     'omnibox': ['suzhe@chromium.org'],
     'message_loop': ['sadrul@chromium.org'],
     'clipboard': ['dcheng@chromium.org'],
   },
 }