roll grit 54:55

chrome/test/functional/special_tabs.py

 #!/usr/bin/env python
 # 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.
 
 import logging
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 35 matching lines @@
     'chrome://credits': { 'title': 'Credits' },
     'chrome://downloads': { 'title': 'Downloads' },
     'chrome://dns': { 'title': 'About DNS' },
     'chrome://extensions': { 'title': 'Extensions' },
     'chrome://flags': {},
     'chrome://flash': {},
     'chrome://gpu-internals': {},
     'chrome://histograms': { 'title': 'About Histograms' },
     'chrome://history': { 'title': 'History' },
     'chrome://media-internals': { 'title': 'Media Internals' },
-    # about:memory broken on win - crbug.com/134988
-    # 'chrome://memory-redirect': { 'title': 'About Memory' },
+    'chrome://memory-redirect': { 'title': 'About Memory' },
     'chrome://net-internals': {},
     'chrome://net-internals/help.html': {},
     'chrome://newtab': { 'title': 'New Tab', 'CSP': False },
     'chrome://plugins': { 'title': 'Plug-ins' },
     'chrome://settings': { 'title': 'Settings' },
     'chrome://settings/autofill': { 'title': 'Settings - Autofill settings' },
     'chrome://settings/clearBrowserData':
       { 'title': 'Settings - Clear browsing data' },
     'chrome://settings/content': { 'title': 'Settings - Content settings' },
     'chrome://settings/languages':
@@ skipping 250 matching lines @@
     """Test special tabs created by accelerators."""
     for accel, title in self.GetSpecialAcceleratorTabs().iteritems():
       self.RunCommand(accel)
       self.assertTrue(self.WaitUntil(
             self.GetActiveTabTitle, expect_retval=title),
           msg='Expected "%s", got "%s"' % (title, self.GetActiveTabTitle()))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()