Make update-flaky-tests work for debug builders as well.

Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 92 matching lines @@
     # is a detail of this class.
     def occurances_and_type_from_result_item(self, item):
         return item[self.RLE_LENGTH], item[self.RLE_VALUE]
 
 
 class BotTestExpectationsFactory(object):
     RESULTS_URL_PREFIX = 'http://test-results.appspot.com/testfile?master=ChromiumWebkit&testtype=layout-tests&name=results-small.json&builder='
 
     def _results_json_for_port(self, port_name, builder_category):
         if builder_category == 'deps':
-            builder_name = builders.deps_builder_name_for_port_name(port_name)
+            builder = builders.deps_builder_name_for_port_name(port_name)
         else:
-            builder_name = builders.builder_name_for_port_name(port_name)
+            builder = builders.builder_name_for_port_name(port_name)
 
-        if not builder_name:
+        if not builder:
             return None
-        results_url = self.RESULTS_URL_PREFIX + urllib.quote(builder_name)
+        return self._results_json_for_builder(builder)
+
+    def _results_json_for_builder(self, builder):
+        results_url = self.RESULTS_URL_PREFIX + urllib.quote(builder)
         try:
             _log.debug('Fetching flakiness data from appengine.')
-            return ResultsJSON(builder_name, json.load(urllib2.urlopen(results_url)))
+            return ResultsJSON(builder, json.load(urllib2.urlopen(results_url)))
         except urllib2.URLError as error:
             _log.warning('Could not retrieve flakiness data from the bot.  url: %s', results_url)
             _log.warning(error)
 
     def expectations_for_port(self, port_name, builder_category='layout'):
+        # FIXME: This only grabs release builder's flakiness data. If we're running debug,
+        # when we should grab the debug builder's data.
+        # FIXME: What should this do if there is no debug builder for a port, e.g. we have
+        # no debug XP builder? Should it use the release bot or another Windows debug bot?
+        # At the very least, it should log an error.
         results_json = self._results_json_for_port(port_name, builder_category)
         if not results_json:
             return None
         return BotTestExpectations(results_json)
 
+    def expectations_for_builder(self, builder):
+        results_json = self._results_json_for_builder(builder)
+        if not results_json:
+            return None
+        return BotTestExpectations(results_json)
 
 class BotTestExpectations(object):
     # FIXME: Get this from the json instead of hard-coding it.
     RESULT_TYPES_TO_IGNORE = ['N', 'X', 'Y']
 
     # specifiers arg is used in unittests to avoid the static dependency on builders.
     def __init__(self, results_json, specifiers=None):
         self.results_json = results_json
         self.specifiers = specifiers or set(builders.specifiers_for_builder(results_json.builder_name))
 
@@ skipping 90 matching lines @@
                 # Otherwise, we include lots of false-positives due to tests that fail
                 # for a couple runs and then start passing.
                 # FIXME: Maybe we should make this more liberal and consider it a flake
                 # even if we only see that failure once.
                 seen_results[result_type] = True
                 continue
 
             results_map[result_type] = True
 
         return results_map.keys()