| Index: chrome/browser/metrics/desktop_session/desktop_session_service_unittest.cc
|
| diff --git a/chrome/browser/metrics/desktop_engagement/desktop_engagement_service_unittest.cc b/chrome/browser/metrics/desktop_session/desktop_session_service_unittest.cc
|
| similarity index 85%
|
| rename from chrome/browser/metrics/desktop_engagement/desktop_engagement_service_unittest.cc
|
| rename to chrome/browser/metrics/desktop_session/desktop_session_service_unittest.cc
|
| index 4670e22f60092f77f8783393827f68f09cfc08d8..4afe8eae4d251dfae99257f68a67478fbbb332f8 100644
|
| --- a/chrome/browser/metrics/desktop_engagement/desktop_engagement_service_unittest.cc
|
| +++ b/chrome/browser/metrics/desktop_session/desktop_session_service_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/metrics/desktop_engagement/desktop_engagement_service.h"
|
| +#include "chrome/browser/metrics/desktop_session/desktop_session_service.h"
|
|
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| @@ -10,33 +10,33 @@
|
| #include "base/test/test_mock_time_task_runner.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -// Mock class for |DesktopEngagementService| for testing.
|
| -class MockDesktopEngagementService : public metrics::DesktopEngagementService {
|
| +// Mock class for |DesktopSessionService| for testing.
|
| +class MockDesktopSessionService : public metrics::DesktopSessionService {
|
| public:
|
| - MockDesktopEngagementService() {}
|
| + MockDesktopSessionService() {}
|
|
|
| bool is_timeout() const { return time_out_; }
|
|
|
| - using metrics::DesktopEngagementService::OnAudioStart;
|
| - using metrics::DesktopEngagementService::OnAudioEnd;
|
| + using metrics::DesktopSessionService::OnAudioStart;
|
| + using metrics::DesktopSessionService::OnAudioEnd;
|
|
|
| protected:
|
| void OnTimerFired() override {
|
| - DesktopEngagementService::OnTimerFired();
|
| + DesktopSessionService::OnTimerFired();
|
| time_out_ = true;
|
| }
|
|
|
| private:
|
| bool time_out_ = false;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(MockDesktopEngagementService);
|
| + DISALLOW_COPY_AND_ASSIGN(MockDesktopSessionService);
|
| };
|
|
|
| -TEST(DesktopEngagementServiceTest, TestVisibility) {
|
| +TEST(DesktopSessionServiceTest, TestVisibility) {
|
| base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
|
| base::HistogramTester histogram_tester;
|
|
|
| - MockDesktopEngagementService instance;
|
| + MockDesktopSessionService instance;
|
|
|
| // The browser becomes visible but it shouldn't start the session.
|
| instance.OnVisibilityChanged(true);
|
| @@ -74,11 +74,11 @@ TEST(DesktopEngagementServiceTest, TestVisibility) {
|
| histogram_tester.ExpectTotalCount("Session.TotalDuration", 2);
|
| }
|
|
|
| -TEST(DesktopEngagementServiceTest, TestUserEvent) {
|
| +TEST(DesktopSessionServiceTest, TestUserEvent) {
|
| base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
|
| base::HistogramTester histogram_tester;
|
|
|
| - MockDesktopEngagementService instance;
|
| + MockDesktopSessionService instance;
|
| instance.SetInactivityTimeoutForTesting(1);
|
|
|
| EXPECT_FALSE(instance.in_session());
|
| @@ -111,11 +111,11 @@ TEST(DesktopEngagementServiceTest, TestUserEvent) {
|
| histogram_tester.ExpectTotalCount("Session.TotalDuration", 1);
|
| }
|
|
|
| -TEST(DesktopEngagementServiceTest, TestAudioEvent) {
|
| +TEST(DesktopSessionServiceTest, TestAudioEvent) {
|
| base::MessageLoop loop(base::MessageLoop::TYPE_DEFAULT);
|
| base::HistogramTester histogram_tester;
|
|
|
| - MockDesktopEngagementService instance;
|
| + MockDesktopSessionService instance;
|
| instance.SetInactivityTimeoutForTesting(1);
|
|
|
| instance.OnVisibilityChanged(true);
|
|
|