Fix imports and bring over a missing file.

scripts/master/factory/chromeos_factory.py

 #!/usr/bin/python
 # Copyright (c) 2006-2010 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 build the chromium master."""
 
 import os
 from buildbot.steps import trigger, shell
 from buildbot.process import factory
 from build_factory import BuildFactory
 
 
-import chromium_config as config
-import chromeos_commands
-import chromeos_build_factory
-import chromeos_revision_source
+from master.factory import chromeos_commands
+from master.factory import chromeos_build_factory
+from master.factory import gclient_factory
+from master import chromeos_revision_source
 
-import gclient_factory
+import config
 
 from buildbot.process.properties import WithProperties
 
 class ChromeOSFactory(gclient_factory.GClientFactory):
   """Encapsulates data and methods common to the chromium master.cfg files."""
 
   DEFAULT_TARGET_PLATFORM = config.Master.default_platform
 
   def __init__(self, build_dir, target_platform=None, target_arch=None,
                official_build=None):
@@ skipping 341 matching lines @@
                           description='triagelog')
 
   def get_factory(self):
     """
     Return the produced factory.
 
     Returns:
         a buildbot factory object
     """
     return self.f_cbuild