Move upload_to_bucket.py out of skia directory.

scripts/master/factory/skia/commands.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.
 
 """Set of utilities to add commands to a buildbot factory.
 
 This is based on commands.py and adds skia-specific commands."""
 
 from buildbot.steps import shell
 
@@ skipping 45 matching lines @@
 
   def AddUploadToBucket(self, source_filepath,
                         dest_gsbase='gs://chromium-skia-gm',
                         description='Upload', timeout=None):
     """Adds a step that uploads a file to a Google Storage Bucket."""
     # TODO(epoger): this should use self._script_dir instead of the manually
     # created path below, but I had trouble with that and didn't want it to
     # block progress for now.
     slave_script_dir = self.PathJoin('..', '..', '..', '..', 'scripts', 'slave')
     path_to_upload_script = self.PathJoin(
-        slave_script_dir, 'skia', 'upload_to_bucket.py')
+        slave_script_dir, 'upload_to_bucket.py')
     cmd = 'python %s --source_filepath=%s --dest_gsbase=%s' % (
         path_to_upload_script, source_filepath, dest_gsbase)
     if not timeout:
       timeout = self.default_timeout
     self.factory.addStep(shell.ShellCommand, description=description,
                          timeout=timeout, command=cmd, workdir=self.workdir,
                          env=self.environment_variables)
 
   def AddMergeIntoSvn(self, source_dir_path, dest_svn_url,
                       svn_username_file, svn_password_file,
@@ skipping 22 matching lines @@
                          timeout=timeout, command=cmd, workdir=self.workdir,
                          env=self.environment_variables)
 
   def AddRun(self, run_command, description='Run', timeout=None):
     """Runs something we built."""
     if not timeout:
       timeout = self.default_timeout
     self.factory.addStep(shell.ShellCommand, description=description,
                          timeout=timeout, command=run_command,
                          workdir=self.workdir, env=self.environment_variables)