commit 937365d529db2f8ad9c2cb5a45650b45022cdebf
author Denis Tosic <dtosic@chromium.org> Wed Jan 09 11:48:30 2019 +0100
committer chrome-bot <chrome-bot@chromium.org> Wed Jan 09 09:38:47 2019 -0800
tree 434a81a4841a7d08a7b5cc2f8bba1bad62f08a07
parent 30f4786ed4e56fe09b3e2c2fc2a35dc7ff8825fe

[autotest][cfm] Improve second screen OOB check

A recent CL changed how the second OOB screen is identified on Hangouts
Meet.

TEST=local device, verified OOB now completes properly
BUG=b:121119062

Change-Id: Id2a9a90b7bf57460835220b646754bcf98f00535
Reviewed-on: https://chromium-review.googlesource.com/1402734
Commit-Ready: Denis Tosic <dtosic@google.com>
Tested-by: Denis Tosic <dtosic@google.com>
Reviewed-by: Kristoffer Erlandsson <kerl@google.com>
Reviewed-by: Claes Malmnäs <malmnas@google.com>

client/cros/multimedia/cfm_facade_native.py

diff --git a/client/cros/multimedia/cfm_facade_native.py b/client/cros/multimedia/cfm_facade_native.py
index fc4a844..fa6ebb5 100644
--- a/client/cros/multimedia/cfm_facade_native.py
+++ b/client/cros/multimedia/cfm_facade_native.py
@@ -179,12 +179,18 @@
                 ctxs = kiosk_utils.get_webview_contexts(self._resource._browser,
                                                         self._EXT_ID)
                 for ctx in ctxs:
-                    url_query = urlparse.urlparse(ctx.GetUrl()).query
+                    parse_result = urlparse.urlparse(ctx.GetUrl())
+                    url_path = parse_result.path
+                    logging.info('Webview path: "%s"', url_path)
+                    url_query = parse_result.query
                     logging.info('Webview query: "%s"', url_query)
                     params = urlparse.parse_qs(url_query,
                                                keep_blank_values = True)
-                    is_oobe_slave_screen = ('nooobestatesync' in params and
-                                            'oobedone' in params)
+                    is_oobe_slave_screen = (
+                        # Hangouts Classic
+                        ('nooobestatesync' in params and 'oobedone' in params)
+                        # Hangouts Meet
+                        or ('oobesecondary' in url_path))
                     if is_oobe_slave_screen:
                         # Skip the oobe slave screen. Not doing this can cause
                         # the wrong webview context to be returned.