Enable components_browsertests on Android

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 re
 import shutil
 import sys
 
@@ skipping 74 matching lines @@
 
 class GtestTestInstance(test_instance.TestInstance):
 
   def __init__(self, args, isolate_delegate, error_func):
     super(GtestTestInstance, self).__init__()
     # TODO(jbudorick): Support multiple test suites.
     if len(args.suite_name) > 1:
       raise ValueError('Platform mode currently supports only 1 gtest suite')
     self._suite = args.suite_name[0]
 
-    if self._suite == 'content_browsertests':
-      error_func('content_browsertests are not currently supported '
-                 'in platform mode.')
+    if (self._suite == 'content_browsertests' or
+        self._suite == 'components_browsertests'):
+      error_func('%s are not currently supported '
+                 'in platform mode.' % self._suite)
       self._apk_path = os.path.join(
           constants.GetOutDirectory(), 'apks', '%s.apk' % self._suite)
     else:
       self._apk_path = os.path.join(
           constants.GetOutDirectory(), '%s_apk' % self._suite,
           '%s-debug.apk' % self._suite)
     self._exe_path = os.path.join(constants.GetOutDirectory(),
                                   self._suite)
     if not os.path.exists(self._apk_path):
       self._apk_path = None
@@ skipping 124 matching lines @@
     return self._apk_path
 
   @property
   def exe(self):
     return self._exe_path
 
   @property
   def suite(self):
     return self._suite