Convert more automation calls to the JSON interface.

chrome/test/functional/multiprofile.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 re
 
 import pyauto_functional
 import pyauto
 
@@ skipping 192 matching lines @@
     # Launch browser with new Profile 1, set startup page to 'www.google.com'.
     self.OpenNewBrowserWindowWithNewProfile()
     self._SetStartUpPage('http://www.google.com', windex=1)
     # Launch browser with new Profile 2, set startup page to 'www.yahoo.com'.
     self.OpenNewBrowserWindowWithNewProfile()
     # Verify start up page for Profile 2 is still newtab page.
     info = self.GetBrowserInfo()
     self.assertEqual('chrome://newtab/', info['windows'][2]['tabs'][0]['url'])
     self._SetStartUpPage('http://www.yahoo.com', windex=2)
     # Exit Profile 1 / Profile 2
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 2, verify startup page.
     self._AssertStartUpPage('http://www.yahoo.com', profile='Profile 2')
     # Relaunch Browser with Profile 1, verify startup page.
     self._AssertStartUpPage('http://www.google.com', profile='Profile 1')
 
   def testHomePageOptionMultiProfile(self):
     """Test Home page for Multi-profile windows."""
     self.assertTrue(self.GetMultiProfileInfo()['enabled'],
                     msg='Multi-profile is not enabled')
     # Launch browser with new Profile 1, set homepage to 'www.google.com'.
     self.OpenNewBrowserWindowWithNewProfile()
     self._SetHomePage('http://www.google.com', windex=1)
     # Launch browser with new Profile 2, set homepage to 'www.yahoo.com'.
     self.OpenNewBrowserWindowWithNewProfile()
     self._SetHomePage('http://www.yahoo.com', windex=2)
     # Exit Profile 1 / Profile 2
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 2, verify startup page.
     self._AssertHomePage('http://www.yahoo.com', profile='Profile 2')
     # Relaunch Browser with Profile 1, verify startup page.
     self._AssertHomePage('http://www.google.com', profile='Profile 1')
 
   def testSessionRestoreInMultiProfile(self):
     """Test session restore preference for Multi-profile windows."""
     self.assertTrue(self.GetMultiProfileInfo()['enabled'],
                     msg='Multi-profile is not enabled')
     # Launch browser with new Profile 1, set pref to restore session on
     # startup.
     self.OpenNewBrowserWindowWithNewProfile()
     self._SetSessionRestoreURLs(self._RESTORE_LASTOPEN_URL_VALUE, windex=1)
     # Launch browser with new Profile 2, do not set session restore pref.
     self.OpenNewBrowserWindowWithNewProfile()
     self._SetSessionRestoreURLs(self._RESTORE_DEFAULT_URL_VALUE, windex=2)
     # Exit Profile 1 / Profile 2
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 1, verify session restores on startup.
     url_list = ['http://www.google.com/', 'http://news.google.com/']
     self._AssertSessionRestore(url_list, self._RESTORE_LASTOPEN_URL_VALUE,
                                num_tabs=2, profile='Profile 1')
     # Relaunch Browser with Profile 2, verify session does not get restored.
     url_list = ['chrome://newtab/']
     self._AssertSessionRestore(url_list, self._RESTORE_DEFAULT_URL_VALUE,
                                num_tabs=1, profile='Profile 2')
 
   def testInstantSearchInMultiProfile(self):
     """Test instant search for Multi-profile windows."""
     self.assertTrue(self.GetMultiProfileInfo()['enabled'],
                     msg='Multi-profile is not enabled')
     # Launch browser with new Profile 1, enable instant search
     self.OpenNewBrowserWindowWithNewProfile()
     self.SetPrefs(pyauto.kInstantEnabled, True, windex=1)
     self.assertTrue(self.GetPrefsInfo(windex=1).Prefs(pyauto.kInstantEnabled))
     # Launch browser with new Profile 2.
     self.OpenNewBrowserWindowWithNewProfile()
     # Exit Profile 1 / Profile 2
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 1, verify instant search is enabled.
     self.AppendBrowserLaunchSwitch('--profile-directory=Profile 1')
     self.RestartBrowser(clear_profile=False)
     self.assertTrue(self.GetPrefsInfo().Prefs(pyauto.kInstantEnabled))
     # Relaunch Browser with Profile 2, verify instant search is disabled.
     self.AppendBrowserLaunchSwitch('--profile-directory=Profile 2')
     self.RestartBrowser(clear_profile=False)
     self.assertFalse(self.GetPrefsInfo().Prefs(pyauto.kInstantEnabled))
 
   def testMakeSearchEngineDefaultInMultiprofile(self):
     """Test adding and making a search engine default for Multi-profiles."""
     self.assertTrue(self.GetMultiProfileInfo()['enabled'],
                     msg='Multi-profile is not enabled')
     # Launch browser with new Profile 1, add search engine to 'Hulu'.
     self.OpenNewBrowserWindowWithNewProfile()
     self._AddSearchEngine('Hulu', 'hulu.com',
         'http://www.hulu.com/search?query=%s&ref=os&src={referrer:source?}', 1)
     self.MakeSearchEngineDefault('hulu.com', windex=1)
     # Launch browser with new Profile 2, add search engine to 'Youtube'.
     self.OpenNewBrowserWindowWithNewProfile()
     self._AddSearchEngine('YouTube Video Search', 'youtube.com',
         'http://www.youtube.com/results?search_query=%s&page={startPage?}'+
         '&utm_source=opensearch', 2)
     self.MakeSearchEngineDefault('youtube.com', windex=2)
     # Exit Profile 1 / Profile 2
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 1, verify default search engine as 'Hulu'.
     self._AssertDefaultSearchEngine('hulu.com', profile='Profile 1')
     # Relaunch Browser with Profile 2, verify default search engine as
     # 'Youtube'.
     self._AssertDefaultSearchEngine('youtube.com', profile='Profile 2')
 
   def testDeleteSearchEngineInMultiprofile(self):
     """Test adding then deleting a search engine for Multi-profiles."""
     self.assertTrue(self.GetMultiProfileInfo()['enabled'],
                     msg='Multi-profile is not enabled')
     # Launch browser with new Profile 1, add 'foo.com' as new search engine.
     self.OpenNewBrowserWindowWithNewProfile()
     self._AddSearchEngine('foo', 'foo.com', 'http://foo/?q=%s', windex=1)
     # Launch browser with new Profile 2, add 'foo.com' as new search engine.
     self.OpenNewBrowserWindowWithNewProfile()
     self._AddSearchEngine('foo', 'foo.com', 'http://foo/?q=%s', windex=2)
     # Delete search engine 'foo.com' from Profile 1 and exit.
     self.DeleteSearchEngine('foo.com', windex=1)
+    self.CloseBrowserWindow(2)
     self.CloseBrowserWindow(1)
-    # Exit Profile 2
-    self.CloseBrowserWindow(2)
     # Relaunch Browser with Profile 1, verify search engine 'foo.com'
     # is deleted.
     self.AppendBrowserLaunchSwitch('--profile-directory=Profile 1')
     self.RestartBrowser(clear_profile=False)
     foo = self._GetSearchEngineWithKeyword('foo.com')
     self.assertFalse(foo)
     # Relaunch Browser with Profile 2, verify search engine 'foo.com'
     # is not deleted.
     self.AppendBrowserLaunchSwitch('--profile-directory=Profile 2')
     self.RestartBrowser(clear_profile=False)
     foo = self._GetSearchEngineWithKeyword('foo.com')
     self.assertTrue(foo)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()