Update references to buildbot globals deprecated by r10856

tools/rebaseline.py

 #!/usr/bin/python
 
 '''
 Copyright 2012 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 20 matching lines @@
 # This assumes that the 'gm' directory has been checked out as a sibling of
 # the 'tools' directory containing this script, which will be the case if
 # 'trunk' was checked out as a single unit.
 GM_DIRECTORY = os.path.realpath(
     os.path.join(os.path.dirname(os.path.dirname(__file__)), 'gm'))
 if GM_DIRECTORY not in sys.path:
   sys.path.append(GM_DIRECTORY)
 import buildbot_globals
 import gm_json
 
-MASTER_HOST_URL = 'http://%s:%s' % (buildbot_globals.Get('master_host'),
-                                    buildbot_globals.Get('external_port'))
+MASTER_HOST_URL = 'http://%s:%s' % (
+    buildbot_globals.Get('public_master_host'),
+    buildbot_globals.Get('public_external_port'))
 ALL_BUILDERS = list(json.load(urllib2.urlopen(
     MASTER_HOST_URL + '/json/builders')))
 TEST_BUILDERS = filter(lambda x: 'Trybot' not in x and 'Test' in x,
                        ALL_BUILDERS)
 
 class _InternalException(Exception):
   pass
 
 # Object that handles exceptions, either raising them immediately or collecting
 # them to display later on.
@@ skipping 278 matching lines @@
         add_new=args.add_new)
     try:
       rebaseliner.RebaselineSubdir(builder=builder)
     except BaseException as e:
       exception_handler.RaiseExceptionOrContinue(e)
   else:
     exception_handler.RaiseExceptionOrContinue(_InternalException(
         'expectations_json_file %s not found' % expectations_json_file))
 
 exception_handler.ReportAllFailures()