Index: chrome/test/chromedriver/performance_logger_unittest.cc |
diff --git a/chrome/test/chromedriver/performance_logger_unittest.cc b/chrome/test/chromedriver/performance_logger_unittest.cc |
index 2d6c7488a80d1259da21c540fcae66bfd4f5921e..68e93e7202a7b1aa51ddcca160efdfd89fac7f77 100644 |
--- a/chrome/test/chromedriver/performance_logger_unittest.cc |
+++ b/chrome/test/chromedriver/performance_logger_unittest.cc |
@@ -13,6 +13,7 @@ |
#include "chrome/test/chromedriver/chrome/log.h" |
#include "chrome/test/chromedriver/chrome/status.h" |
#include "chrome/test/chromedriver/chrome/stub_devtools_client.h" |
+#include "chrome/test/chromedriver/session.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace { |
@@ -149,7 +150,8 @@ void ExpectEnableDomains(FakeDevToolsClient& client) { |
TEST(PerformanceLogger, OneWebView) { |
FakeDevToolsClient client("webview-1"); |
FakeLog log; |
- PerformanceLogger logger(&log); |
+ Session session("test"); |
+ PerformanceLogger logger(&log, &session); |
client.AddListener(&logger); |
logger.OnConnected(&client); |
@@ -168,7 +170,8 @@ TEST(PerformanceLogger, TwoWebViews) { |
FakeDevToolsClient client1("webview-1"); |
FakeDevToolsClient client2("webview-2"); |
FakeLog log; |
- PerformanceLogger logger(&log); |
+ Session session("test"); |
+ PerformanceLogger logger(&log, &session); |
client1.AddListener(&logger); |
client2.AddListener(&logger); |
@@ -192,18 +195,18 @@ TEST(PerformanceLogger, TwoWebViews) { |
TEST(PerformanceLogger, PerfLoggingPrefs) { |
FakeDevToolsClient client("webview-1"); |
FakeLog log; |
+ Session session("test"); |
PerfLoggingPrefs prefs; |
ASSERT_EQ(PerfLoggingPrefs::InspectorDomainStatus::kDefaultEnabled, |
prefs.network); |
prefs.network = PerfLoggingPrefs::InspectorDomainStatus::kExplicitlyDisabled; |
- // Trace categories should be ignored until tracing support is implemented. |
prefs.trace_categories = "benchmark,webkit.console"; |
- PerformanceLogger logger(&log, prefs); |
+ PerformanceLogger logger(&log, &session, prefs); |
client.AddListener(&logger); |
logger.OnConnected(&client); |
EXPECT_EQ("Page.enable", client.PopSentCommand()); |
- // Trace categories ignored, so Timeline shouldn't be implicitly disabled. |
- EXPECT_EQ("Timeline.start", client.PopSentCommand()); |
+ // No Timeline.enable command since specifying trace categories implicitly |
+ // disables Timeline feed. |
EXPECT_TRUE(client.PopSentCommand().empty()); |
} |