[WebUI] Fix rest of CSS style nits so I can turn on CSS checker.

chrome/browser/resources/PRESUBMIT.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 WebUI resources.
 
 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into gcl/git cl, and see
 http://www.chromium.org/developers/web-development-style-guide for the rules
 we're checking against here.
@@ skipping 26 matching lines @@
     results.extend(
         input_api.canned_checks.RunUnitTests(input_api, output_api, tests))
 
   import sys
   old_path = sys.path
 
   try:
     sys.path.insert(0, resources)
     from web_dev_style import css_checker, js_checker
 
+    # NOTE: This presubmit only scans affected files in this directory or in
+    # subdirectories, that why we don't need to check for .startswith(resources)
+    # here.
+    def is_resource(f):
+      return f.LocalPath().endswith(('.css', '.html', '.js'))
+
     # TODO(dbeam): Remove this directory filter eventually when ready.
     dirs = (
         path.join(resources, 'extensions'),
         path.join(resources, 'help'),
         path.join(resources, 'net_internals'),
         path.join(resources, 'ntp4'),
         path.join(resources, 'options2'),
         path.join(resources, 'uber'),
     )
-    def file_filter(affected_file):
-      f = affected_file.AbsoluteLocalPath()
-      return (f.startswith(dirs) and f.endswith(('.css', '.html', '.js')))
+    def certain_dirs(f):
+      return is_resource(f) and f.AbsoluteLocalPath().startswith(dirs)
 
     results.extend(css_checker.CSSChecker(input_api, output_api,
-                                          file_filter=file_filter).RunChecks())
+                                          file_filter=is_resource).RunChecks())
     results.extend(js_checker.JSChecker(input_api, output_api,
-                                        file_filter=file_filter).RunChecks())
+                                        file_filter=certain_dirs).RunChecks())
   finally:
     sys.path = old_path
 
   return results