Revert of Refactor serving_dirs.

tools/telemetry/telemetry/util/find_dependencies.py

 # Copyright 2014 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.
 
 import fnmatch
 import imp
 import logging
 import modulefinder
 import optparse
 import os
@@ skipping 73 matching lines @@
 
     # Page set paths are relative to their runner script, not relative to us.
     util.GetBaseDir = lambda: base_dir
     # TODO: Loading the page set will automatically download its Cloud Storage
     # deps. This is really expensive, and we don't want to do this by default.
     page_set = test_obj.CreatePageSet(options)
 
     # Add all of its serving_dirs as dependencies.
     for serving_dir in page_set.serving_dirs:
       yield serving_dir
+    for page in page_set:
+      if page.is_file:
+        yield page.serving_dir
 
 
 def FindExcludedFiles(files, options):
   def MatchesConditions(path, conditions):
     for condition in conditions:
       if condition(path):
         return True
     return False
 
   # Define some filters for files.
@@ skipping 148 matching lines @@
 
   def Run(self, args):
     paths = args.positional_args
     dependencies = FindDependencies(paths, args)
     if args.zip:
       ZipDependencies(paths, dependencies, args)
       print 'Zip archive written to %s.' % args.zip
     else:
       print '\n'.join(sorted(dependencies))
     return 0