Fix imports and bring over a missing file.

site_config/config.py

 #!/usr/bin/python
 # Copyright (c) 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.
 
 """Declares a number of site-dependent variables for use by scripts.
 
 A typical use of this module would be
 
   import chromium_config as config
 
   v8_url = config.Master.v8_url
 """
 
 import os
 import sys
 
 from twisted.spread import banana
 
-try:
-  import config_private
-except:
-  import config_default as config_private
+import config_private
 from common import chromium_utils
 
 # By default, the banana's string size limit is 640kb, which is unsufficient
 # when passing diff's around. Raise it to 100megs. Do this here since the limit
 # is enforced on both the server and the client so both need to raise the
 # limit.
 banana.SIZE_LIMIT = 100 * 1024 * 1024
 
 
 class Master(config_private.Master):
@@ skipping 171 matching lines @@
 
   # Where to find layout test results by default, above the build directory.
   layout_test_result_dir = 'layout-test-results'
 
   # Where to save layout test results.
   layout_test_result_archive = www_dir_base + 'layout_test_results'
 
   # Where to save gtest JSON results.
   gtest_result_archive = www_dir_base + 'gtest_results'
 
-class IRC(config_private.IRC):
-  """Options for the IRC bot."""
-  # Where the IRC bot lives.
-  host = 'irc.freenode.net'
-  channels = ['#chromium']
-
-  default_topic = 'IRC bot not yet connected'
-
-  whuffie_file = '~/www/irc/whuffie_list.js'
-  whuffie_reason_file = '~/www/irc/whuffie_reasons.js'
-  topic_file = '~/www/irc/topic_list.js'
-
-  # Any URLs found in IRC topics will be passed as %s to this format before
-  # being added to the topic-list page. It must contain exactly one "%s" token.
-  # To disable URL mangling, set this to "%s".
-  href_redirect_format = 'http://www.google.com/url?sa=D&q=%s'
-
-
 class Distributed(config_private.Distributed):
   # File holding current version information.
   version_file = Installer.version_file