Index: components/sync_sessions/sync_sessions_metrics_unittest.cc |
diff --git a/components/sync_sessions/sync_sessions_metrics_unittest.cc b/components/sync_sessions/sync_sessions_metrics_unittest.cc |
index 902637d880681a9190c307a05322f622dfc3aa74..ba6a09cf7564aa2c07590a80e53b3f6cabebc367 100644 |
--- a/components/sync_sessions/sync_sessions_metrics_unittest.cc |
+++ b/components/sync_sessions/sync_sessions_metrics_unittest.cc |
@@ -5,6 +5,7 @@ |
#include "components/sync_sessions/sync_sessions_metrics.h" |
#include <algorithm> |
+#include <memory> |
#include "base/memory/ptr_util.h" |
#include "base/test/histogram_tester.h" |
@@ -15,7 +16,6 @@ |
#include "components/sync_sessions/synced_session.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-using sync_driver::SyncedSession; |
using sessions::SessionWindow; |
using sessions::SessionTab; |
using base::Time; |
@@ -25,20 +25,20 @@ namespace sync_sessions { |
namespace { |
-class FakeSessionsSyncManager : public browser_sync::SessionsSyncManager { |
+class FakeSessionsSyncManager : public SessionsSyncManager { |
public: |
FakeSessionsSyncManager(SyncSessionsClient* sessions_client, |
std::vector<std::unique_ptr<SyncedSession>>* sessions) |
- : browser_sync::SessionsSyncManager(sessions_client, |
- nullptr, |
- nullptr, |
- nullptr, |
- base::Closure(), |
- base::Closure()), |
+ : SessionsSyncManager(sessions_client, |
+ nullptr, |
+ nullptr, |
+ nullptr, |
+ base::Closure(), |
+ base::Closure()), |
sessions_(sessions) {} |
bool GetAllForeignSessions( |
- std::vector<const sync_driver::SyncedSession*>* sessions) override { |
+ std::vector<const SyncedSession*>* sessions) override { |
for (auto& session : *sessions_) { |
sessions->push_back(session.get()); |
} |
@@ -102,9 +102,7 @@ class SyncSessionsMetricsTest : public ::testing::Test { |
return SyncSessionsMetrics::MaxTabTimestamp(typed_sessions); |
} |
- browser_sync::SessionsSyncManager* get_sessions_sync_manager() { |
- return &fake_manager_; |
- } |
+ SessionsSyncManager* get_sessions_sync_manager() { return &fake_manager_; } |
private: |
std::vector<std::unique_ptr<SyncedSession>> sessions_; |