Remove some stale/duplicate directories in NTP watchlist and add options.

[email protected]
BUG=None
NOTRY=true


Review URL: https://chromiumcodereview.appspot.com/11363132

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166578 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/WATCHLISTS b/WATCHLISTS
index 2877ad9..15df3e8e 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -298,14 +298,17 @@
     },
     'ntp': {
       'filepath': 'chrome/browser/resources/ntp4/|'\
-        'chrome/browser/resources/touch_ntp/|'\
-        'chrome/browser/resources/touch_ntp/|'\
+        'chrome/browser/resources/ntp_search/|'\
         'chrome/browser/ui/webui/ntp/',
     },
     'omnibox': {
       'filepath': 'chrome/browser/autocomplete/'\
                   '|chrome/browser/ui/.*/omnibox/'
     },
+    'options': {
+      'filepath': 'chrome/browser/resources/options/|'\
+          'chrome/browser/ui/webui/options/',
+    },
     'panels': {
       'filepath': 'chrome/browser/ui/panels'\
                   '|chrome/browser/ui/cocoa/panels'\
@@ -576,6 +579,7 @@
     'npapi_headers': ['[email protected]'],
     'ntp': ['[email protected]', '[email protected]'],
     'omnibox': ['[email protected]'],
+    'options': ['[email protected]'],
     'panels': ['[email protected]', '[email protected]',
                '[email protected]', '[email protected]'],
     'pepper_api': ['[email protected]', '[email protected]',