Merge pull request #16902 from zacc/bug_979843

Bug 979843 - Try run removing redundant switch_to_frame code in gaiatest...

tests/python/gaia-ui-tests/gaiatest/gaia_test.py

@@ -77,7 +77,7 @@ def set_permission(self, app_name, permission_name, value):
         return self.marionette.execute_async_script("return GaiaApps.setPermission('%s', '%s', '%s')" %
                                                     (app_name, permission_name, value))
 
-    def launch(self, name, switch_to_frame=True, url=None, launch_timeout=None):
+    def launch(self, name, switch_to_frame=True, launch_timeout=None):
         self.marionette.switch_to_frame()
         result = self.marionette.execute_async_script("GaiaApps.launchWithName('%s')" % name, script_timeout=launch_timeout)
         assert result, "Failed to launch app with name '%s'" % name
@@ -88,7 +88,7 @@ def launch(self, name, switch_to_frame=True, url=None, launch_timeout=None):
         if app.frame_id is None:
             raise Exception("App failed to launch; there is no app frame")
         if switch_to_frame:
-            self.switch_to_frame(app.frame_id, url)
+            self.marionette.switch_to_frame(app.frame_id)
         return app
 
     @property
@@ -152,22 +152,6 @@ def running_apps(self):
             result.append(GaiaApp(origin=app['origin'], name=app['name']))
         return result
 
-    def switch_to_frame(self, app_frame, url=None, timeout=None):
-        timeout = timeout or (self.marionette.timeout and self.marionette.timeout / 1000) or 30
-        self.marionette.switch_to_frame(app_frame)
-        start = time.time()
-        if not url:
-            def check(now):
-                return "about:blank" not in now
-        else:
-            def check(now):
-                return url in now
-        while (time.time() - start < timeout):
-            if check(self.marionette.get_url()):
-                return
-            time.sleep(2)
-        raise TimeoutException('Could not switch to app frame %s in time' % app_frame)
-
 
 class GaiaData(object):