Remove the singleton instance get/delete methods from RootWindow (yay)

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 722 matching lines @@
 
             'browser/accessibility/accessibility_win_browsertest.cc',
             'browser/accessibility/browser_views_accessibility_browsertest.cc',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                  '../base/allocator/allocator.gyp:allocator',
               ],
             }],
+            ['use_aura==1', {
+              'sources/': [
+                ['exclude', '^browser/accessibility/accessibility_win_browsertest.cc'],
+                ['exclude', '^browser/accessibility/browser_views_accessibility_browsertest.cc'],
+              ],
+            }],
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_debug_link_nonincremental)',
                 },
               },
             },
           },  # configurations
@@ skipping 3947 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }