[chromedriver] Disable Timeline by default in performance logs

BUG=
TBR=stgao@chromium.org

Review URL: https://codereview.chromium.org/985243002

Cr-Commit-Position: refs/heads/master@{#319582}

chrome/test/chromedriver/capabilities.cc

@@ -536,7 +536,7 @@ std::string Switches::ToString() const {
 PerfLoggingPrefs::PerfLoggingPrefs()
     : network(InspectorDomainStatus::kDefaultEnabled),
       page(InspectorDomainStatus::kDefaultEnabled),
-      timeline(InspectorDomainStatus::kDefaultEnabled),
+      timeline(InspectorDomainStatus::kDefaultDisabled),
       trace_categories(),
       buffer_usage_reporting_interval(1000) {}
 

chrome/test/chromedriver/capabilities.h

@@ -76,6 +76,8 @@ struct PerfLoggingPrefs {
 
   InspectorDomainStatus network;
   InspectorDomainStatus page;
+  // TODO(samuong): Timeline was removed in blink 189656 (chromium commit
+  // position 315092) so remove this option once we stop supporting M41.
   InspectorDomainStatus timeline;
 
   std::string trace_categories;  // Non-empty string enables tracing.

chrome/test/chromedriver/capabilities_unittest.cc

@@ -348,7 +348,7 @@ TEST(ParseCapabilities, PerfLoggingPrefsInspectorDomainStatus) {
             capabilities.perf_logging_prefs.network);
   ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled,
             capabilities.perf_logging_prefs.page);
-  ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled,
+  ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultDisabled,
             capabilities.perf_logging_prefs.timeline);
   base::DictionaryValue perf_logging_prefs;
   perf_logging_prefs.SetBoolean("enableNetwork", true);
@@ -361,7 +361,7 @@ TEST(ParseCapabilities, PerfLoggingPrefsInspectorDomainStatus) {
             capabilities.perf_logging_prefs.network);
   ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kExplicitlyDisabled,
             capabilities.perf_logging_prefs.page);
-  ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled,
+  ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultDisabled,
             capabilities.perf_logging_prefs.timeline);
 }
 

chrome/test/chromedriver/performance_logger_unittest.cc

@@ -171,7 +171,6 @@ void ExpectCommand(FakeDevToolsClient& client, const std::string& method) {
 void ExpectEnableDomains(FakeDevToolsClient& client) {
   ExpectCommand(client, "Network.enable");
   ExpectCommand(client, "Page.enable");
-  ExpectCommand(client, "Timeline.start");
 }
 
 }  // namespace
@@ -215,11 +214,11 @@ TEST(PerformanceLogger, TwoWebViews) {
   ASSERT_FALSE(client2.PopSentCommand(&cmd));
 
   ASSERT_EQ(kOk, client1.TriggerEvent("Page.gaga1").code());
-  ASSERT_EQ(kOk, client2.TriggerEvent("Timeline.gaga2").code());
+  ASSERT_EQ(kOk, client2.TriggerEvent("Network.gaga2").code());
 
   ASSERT_EQ(2u, log.GetEntries().size());
   ValidateLogEntry(log.GetEntries()[0], "webview-1", "Page.gaga1");
-  ValidateLogEntry(log.GetEntries()[1], "webview-2", "Timeline.gaga2");
+  ValidateLogEntry(log.GetEntries()[1], "webview-2", "Network.gaga2");
 }
 
 TEST(PerformanceLogger, PerfLoggingPrefs) {

chrome/test/chromedriver/test/run_py_tests.py

@@ -1239,7 +1239,6 @@ class PerformanceLoggerTest(ChromeDriverBaseTest):
   def testPerformanceLogger(self):
     driver = self.CreateDriver(
         experimental_options={'perfLoggingPrefs': {
-            'enableTimeline': True,
             'traceCategories': 'webkit.console,blink.console'
           }}, performance_log_level='ALL')
     driver.Load(
@@ -1268,7 +1267,7 @@ class PerformanceLoggerTest(ChromeDriverBaseTest):
         self.assertTrue(devtools_message['params']['name'] == 'foobar')
         marked_timeline_events.append(devtools_message)
     self.assertEquals(2, len(marked_timeline_events))
-    self.assertEquals({'Network', 'Page', 'Timeline', 'Tracing'},
+    self.assertEquals({'Network', 'Page', 'Tracing'},
                       set(seen_log_domains.keys()))