Update expectations for, and re-enable, gpu_integration_test_unittest.

content/test/gpu/gpu_tests/gpu_integration_test_unittest.py

 # Copyright 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.
 
 import json
 import mock
 import os
 import tempfile
 import unittest
 
@@ skipping 57 matching lines @@
     elif file_path == 'flaky.html':
       if self.__class__._num_flaky_runs_to_fail > 0:
         self.__class__._num_flaky_runs_to_fail -= 1
         self.fail('Expected flaky failure')
     elif file_path == 'error.html':
       raise Exception('Expected exception')
 
 
 class GpuIntegrationTestUnittest(unittest.TestCase):
   @mock.patch('telemetry.internal.util.binary_manager.InitDependencyManager')
-  # https://crbug.com/352807
-  @unittest.skip("Temporarily skip until Catapult rolls forward")
   def testSimpleIntegrationUnittest(self, mockInitDependencyManager):
     options = browser_test_runner.TestRunOptions()
     # Suppress printing out information for passing tests.
     options.verbosity = 0
     config = gpu_project_config.CONFIG
     temp_file = tempfile.NamedTemporaryFile(delete=False)
     temp_file.close()
     temp_file_name = temp_file.name
     try:
       browser_test_runner.Run(
           config, options,
           ['simple_integration_unittest',
            '--write-abbreviated-json-results-to=%s' % temp_file_name])
       with open(temp_file_name) as f:
         test_result = json.load(f)
-      prefix = 'gpu_tests.gpu_integration_test_unittest.' + \
-               'SimpleIntegrationUnittest.'
       self.assertEquals(test_result['failures'], [
-          prefix + 'unexpected_error',
-          prefix + 'unexpected_failure'])
+          'unexpected_error',
+          'unexpected_failure'])
       self.assertEquals(test_result['successes'], [
-          prefix + 'expected_failure',
-          prefix + 'expected_flaky'])
+          'expected_failure',
+          'expected_flaky'])
       self.assertEquals(test_result['valid'], True)
       # It might be nice to be more precise about the order of operations
       # with these browser restarts, but this is at least a start.
       self.assertEquals(SimpleIntegrationUnittest._num_browser_starts, 5)
     finally:
       os.remove(temp_file_name)