Enable some profile_chrome unit tests on Trybots

systrace/profile_chrome/chrome_tracing_agent_unittest.py

Index: systrace/profile_chrome/chrome_tracing_agent_unittest.py
diff --git a/systrace/profile_chrome/chrome_tracing_agent_unittest.py b/systrace/profile_chrome/chrome_tracing_agent_unittest.py
index 2fd0692347a512023ce8e6a48ac38b1247e5c0ff..dc3875957cfe95c866e060685ad5cd4480a22327 100644
--- a/systrace/profile_chrome/chrome_tracing_agent_unittest.py
+++ b/systrace/profile_chrome/chrome_tracing_agent_unittest.py
@@ -6,10 +6,20 @@ import json
 
 from profile_chrome import chrome_tracing_agent
 from profile_chrome import agents_unittest
+from systrace import decorators
 
 
 class ChromeAgentTest(agents_unittest.BaseAgentTest):
+  # TODO(washingtonp): This test seems to fail on the version of Android
+  # currently on the Trybot servers (KTU84P), although it works on Android M.
+  # Either upgrade the version of Android on the Trybot servers or determine
+  # if there is a way to run this agent on Android KTU84P.
+  @decorators.Disabled
   def testGetCategories(self):
+    curr_browser = self.GetChromeProcessID()
+    if curr_browser == None:
+      self.StartBrowser()
+
     categories = \
         chrome_tracing_agent.ChromeTracingAgent.GetCategories(
             self.device, self.package_info)
@@ -18,13 +28,21 @@ class ChromeAgentTest(agents_unittest.BaseAgentTest):
     self.assertTrue(categories[0])
     self.assertTrue(categories[1])
 
+  # TODO(washingtonp): This test is pretty flaky on the version of Android
+  # currently on the Trybot servers (KTU84P), although it works on Android M.
+  # Either upgrade the version of Android on the Trybot servers or determine
+  # if there is a way to run this agent on Android KTU84P.
+  @decorators.Disabled
   def testTracing(self):
+    curr_browser = self.GetChromeProcessID()
+    if curr_browser == None:
+      self.StartBrowser()
+
     categories = '*'
     ring_buffer = False
     agent = chrome_tracing_agent.ChromeTracingAgent(self.device,
                                                     self.package_info,
                                                     ring_buffer)
-
     agent.StartAgentTracing(chrome_tracing_agent.ChromeConfig(categories, None,
         None, None, None, None, None, None, ring_buffer, self.device,
         self.package_info))