sandwich: Fix some trivial failures on SWR benchmark runs

tools/android/loading/request_track.py

 # Copyright (c) 2016 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.
 
 """The request data track.
 
 When executed, parses a JSON dump of DevTools messages.
 """
 
 import bisect
@@ skipping 323 matching lines @@
     return self.status is not None
 
   def GetCacheControlDirective(self, directive_name):
     """Returns the value of a Cache-Control directive, or None."""
     cache_control_str = self.GetHTTPResponseHeader('Cache-Control')
     if cache_control_str is None:
       return None
     directives = [s.strip() for s in cache_control_str.split(',')]
     for directive in directives:
       parts = directive.split('=')
-      if len(parts) == 1:
+      if len(parts) != 2:
         continue
       (name, value) = parts
       if name == directive_name:
         return value
     return None
 
   def MaxAge(self):
     """Returns the max-age of a resource, or -1."""
     # TODO(lizeb): Handle the "Expires" header as well.
     cache_control = {}
@@ skipping 23 matching lines @@
     request_time and the latest timing event.
     """
     # All fields in timing are millis relative to request_time.
     return self.timing.LargestOffset()
 
   def GetRawResponseHeaders(self):
     """Gets the request's raw response headers compatible with
     net::HttpResponseHeaders's constructor.
     """
     assert not self.IsDataRequest()
-    headers = '{} {} {}\x00'.format(
-        self.protocol.upper(), self.status, self.status_text)
+    assert self.HasReceivedResponse()
+    headers = bytes('{} {} {}\x00'.format(
+        self.protocol.upper(), self.status, self.status_text))
     for key in sorted(self.response_headers.keys()):
-      headers += '{}: {}\x00'.format(key, self.response_headers[key])
+      headers += (bytes(key.encode('latin-1')) + b': ' +
+          bytes(self.response_headers[key].encode('latin-1')) + b'\x00')
     return headers
 
   def __eq__(self, o):
     return self.__dict__ == o.__dict__
 
   def __hash__(self):
     return hash(self.request_id)
 
   def __str__(self):
     return json.dumps(self.ToJsonDict(), sort_keys=True, indent=2)
@@ skipping 460 matching lines @@
 
 
 if __name__ == '__main__':
   import json
   import sys
   events = json.load(open(sys.argv[1], 'r'))
   request_track = RequestTrack(None)
   for event in events:
     event_method = event['method']
     request_track.Handle(event_method, event)