Disable SafeBrowsingOff test for Android

Disable SafeBrowsingOff test for Android

This test is designed to verify that safe browsing doesn't interfere on desktop and webview platforms, but shouldn't run for android where safe browsing is expected to work.

BUG=468087
Committed: https://crrev.com/b63511e942695914ce8926b0f8aa5c65d8645aa8
Cr-Commit-Position: refs/heads/master@{#321179}

[bustamante, 2015-03-17 22:19:50]

bustamante@chromium.org changed reviewers:
+ bengr@chromium.org, sclittle@chromium.org

[bustamante, 2015-03-17 22:21:08]

I ran into this running the tests manually, while the waterfall tests are
offline.  It's just a one line change, please take a look when you have a
chance.

[sclittle, 2015-03-17 22:24:55]

https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
File tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py (right):

https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py:164:
@benchmark.Disabled('android')
Doesn't 'android' also apply to android webview?

[bengr, 2015-03-17 22:32:05]

https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
File tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py (right):

https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py:164:
@benchmark.Disabled('android')
On 2015/03/17 22:24:54, sclittle wrote:
> Doesn't 'android' also apply to android webview?

I thought 'android-webview' was for webview.

[bustamante, 2015-03-17 23:48:09]

On 2015/03/17 22:32:05, bengr wrote:
>
https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
> File tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py (right):
> 
>
https://codereview.chromium.org/1003773003/diff/1/tools/chrome_proxy/integrat...
> tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py:164:
> @benchmark.Disabled('android')
> On 2015/03/17 22:24:54, sclittle wrote:
> > Doesn't 'android' also apply to android webview?
> 
> I thought 'android-webview' was for webview.

Good catch, it looks like Telemetry will do a match against both the os and
browser type and if either match apply the decorator, android-webview still runs
on "android" so it's affected by this flag.

I added code to pull in the possible chrome browser names on android, filter out
"webview" options, and use the rest for enabling/disabling.

[sclittle, 2015-03-18 17:39:59]

Cool! I had no idea this sort of filtering was even possible.

https://codereview.chromium.org/1003773003/diff/20001/tools/chrome_proxy/inte...
File tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py (right):

https://codereview.chromium.org/1003773003/diff/20001/tools/chrome_proxy/inte...
tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py:12: browser for
browser in android_browser_finder.CHROME_PACKAGE_NAMES\
Is the backslash necessary? Would it be possible to just wrap it in parens?

[bustamante, 2015-03-18 18:19:22]

Thanks! PTAL when you have a chance.

https://codereview.chromium.org/1003773003/diff/20001/tools/chrome_proxy/inte...
File tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py (right):

https://codereview.chromium.org/1003773003/diff/20001/tools/chrome_proxy/inte...
tools/chrome_proxy/integration_tests/chrome_proxy_benchmark.py:12: browser for
browser in android_browser_finder.CHROME_PACKAGE_NAMES\
On 2015/03/18 17:39:59, sclittle wrote:
> Is the backslash necessary? Would it be possible to just wrap it in parens?

Removed, no it's not necessary.

[sclittle, 2015-03-18 18:23:14]

LGTM

[bustamante, 2015-03-18 18:24:30]

The CQ bit was checked by bustamante@chromium.org

[commit-bot: I haz the power, 2015-03-18 18:24:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1003773003/40001

[commit-bot: I haz the power, 2015-03-18 18:53:41]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2015-03-18 18:54:29]

Patchset 3 (id:??) landed as
https://crrev.com/b63511e942695914ce8926b0f8aa5c65d8645aa8
Cr-Commit-Position: refs/heads/master@{#321179}