Revert of Adding test to ensure context restoration due to GC doesn't crash

content/test/gpu/gpu_tests/context_lost.py

 # Copyright (c) 2013 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 os
 
 from telemetry import test as test_module
 from telemetry.core import util
 from telemetry.page import page_set
 from telemetry.page import page_test
 
@@ skipping 73 matching lines @@
           pass
         new_tab.Close()
         if not completed:
           raise page_test.Failure(
               'Test didn\'t complete (no context lost event?)')
         if not tab.EvaluateJavaScript(
           'window.domAutomationController._succeeded'):
           raise page_test.Failure(
             'Test failed (context not restored properly?)')
 
-    elif page.force_garbage_collection:
-      # Force GC to clean up any contexts not attached to the page.
-      tab.CollectGarbage()
-      completed = False
-      try:
-        print "Waiting for page to finish."
-        util.WaitFor(lambda: tab.EvaluateJavaScript(
-            'window.domAutomationController._finished'), wait_timeout)
-        completed = True
-      except util.TimeoutException:
-        pass
-
-      if not completed:
-        raise page_test.Failure(
-            'Test didn\'t complete (no context restored event?)')
-      if not tab.EvaluateJavaScript(
-        'window.domAutomationController._succeeded'):
-        raise page_test.Failure(
-          'Test failed (context not restored properly?)')
-
 class ContextLost(test_module.Test):
   enabled = True
   test = _ContextLostValidator
   # For the record, this would have been another way to get the pages
   # to repeat. pageset_repeat would be another option.
   # options = {'page_repeat': 5}
   def CreatePageSet(self, options):
     page_set_dict = {
       'description': 'Test cases for real and synthetic context lost events',
       'user_agent_type': 'desktop',
       'serving_dirs': [''],
       'pages': [
         {
           'name': 'ContextLost.WebGLContextLostFromGPUProcessExit',
           'url': 'file://webgl.html?query=kill_after_notification',
           'script_to_evaluate_on_commit': harness_script,
           'navigate_steps': [
             { 'action': 'navigate' },
             { 'action': 'wait',
               'javascript': 'window.domAutomationController._loaded' }
           ],
           'kill_gpu_process': True,
           'number_of_gpu_process_kills': 1,
-          'force_garbage_collection': False
         },
         {
           'name': 'ContextLost.WebGLContextLostFromLoseContextExtension',
           'url': 'file://webgl.html?query=WEBGL_lose_context',
           'script_to_evaluate_on_commit': harness_script,
           'navigate_steps': [
             { 'action': 'navigate' },
             { 'action': 'wait',
               'javascript': 'window.domAutomationController._finished' }
           ],
-          'kill_gpu_process': False,
-          'force_garbage_collection': False
-        },
-        {
-          'name': 'ContextLost.WebGLContextLostFromQuantity',
-          'url': 'file://webgl.html?query=forced_quantity_loss',
-          'script_to_evaluate_on_commit': harness_script,
-          'navigate_steps': [
-            { 'action': 'navigate' },
-            { 'action': 'wait',
-              'javascript': 'window.domAutomationController._loaded' }
-          ],
-          'kill_gpu_process': False,
-          'force_garbage_collection': True
+          'kill_gpu_process': False
         },
       ]
     }
     return page_set.PageSet.FromDict(page_set_dict, data_path)