diff --git a/sharing/nearby_sharing_event_logger.cc b/sharing/nearby_sharing_event_logger.cc
index df3932eb..425060ba 100644
--- a/sharing/nearby_sharing_event_logger.cc
+++ b/sharing/nearby_sharing_event_logger.cc
@@ -14,9 +14,6 @@
 
 #include "sharing/nearby_sharing_event_logger.h"
 
-#include <memory>
-#include <utility>
-
 #include "internal/analytics/event_logger.h"
 #include "sharing/common/nearby_share_prefs.h"
 #include "sharing/internal/api/preference_manager.h"
@@ -28,10 +25,9 @@ namespace sharing {
 using ::nearby::sharing::api::PreferenceManager;
 
 NearbySharingEventLogger::NearbySharingEventLogger(
-    PreferenceManager& preference_manager,
-    std::unique_ptr<nearby::analytics::EventLogger> event_logger)
-    : preference_manager_(preference_manager),
-      event_logger_(std::move(event_logger)) {}
+    const PreferenceManager& preference_manager,
+    nearby::analytics::EventLogger* event_logger)
+    : preference_manager_(preference_manager), event_logger_(event_logger) {}
 
 NearbySharingEventLogger::~NearbySharingEventLogger() = default;
 
diff --git a/sharing/nearby_sharing_event_logger.h b/sharing/nearby_sharing_event_logger.h
index 17c23395..0842754c 100644
--- a/sharing/nearby_sharing_event_logger.h
+++ b/sharing/nearby_sharing_event_logger.h
@@ -15,8 +15,6 @@
 #ifndef THIRD_PARTY_NEARBY_SHARING_NEARBY_SHARING_EVENT_LOGGER_H_
 #define THIRD_PARTY_NEARBY_SHARING_NEARBY_SHARING_EVENT_LOGGER_H_
 
-#include <memory>
-
 #include "internal/analytics/event_logger.h"
 #include "sharing/internal/api/preference_manager.h"
 #include "google/protobuf/message_lite.h"
@@ -30,15 +28,15 @@ namespace sharing {
 class NearbySharingEventLogger : public nearby::analytics::EventLogger {
  public:
   NearbySharingEventLogger(
-      nearby::sharing::api::PreferenceManager& preference_manager,
-      std::unique_ptr<nearby::analytics::EventLogger> event_logger);
+      const nearby::sharing::api::PreferenceManager& preference_manager,
+      nearby::analytics::EventLogger* event_logger);
   ~NearbySharingEventLogger() override;
 
   void Log(const ::google::protobuf::MessageLite& message) override;
 
  private:
-  nearby::sharing::api::PreferenceManager& preference_manager_;
-  std::unique_ptr<nearby::analytics::EventLogger> event_logger_;
+  const nearby::sharing::api::PreferenceManager& preference_manager_;
+  nearby::analytics::EventLogger* const event_logger_;
 };
 
 }  // namespace sharing
diff --git a/sharing/nearby_sharing_event_logger_test.cc b/sharing/nearby_sharing_event_logger_test.cc
index cb4d2e7c..3dbd885b 100644
--- a/sharing/nearby_sharing_event_logger_test.cc
+++ b/sharing/nearby_sharing_event_logger_test.cc
@@ -40,10 +40,9 @@ class NearbySharingEventLoggerTest : public ::testing::Test {
   NearbySharingEventLoggerTest() = default;
 
   void SetUp() override {
-    auto event_logger = std::make_unique<MockEventLogger>();
-    raw_event_logger_ = event_logger.get();
+    event_logger_ = std::make_unique<MockEventLogger>();
     sharing_event_logger_ = std::make_unique<NearbySharingEventLogger>(
-        preference_manager_, std::move(event_logger));
+        preference_manager_, event_logger_.get());
   }
 
   void SetEventLogger(bool enabled) {
@@ -51,7 +50,7 @@ class NearbySharingEventLoggerTest : public ::testing::Test {
                                    enabled);
   }
 
-  const MockEventLogger* event_logger() { return raw_event_logger_; }
+  const MockEventLogger* event_logger() { return event_logger_.get(); }
 
   std::unique_ptr<SharingLog> GetTestEvent() {
     auto sharing_log =
@@ -72,7 +71,7 @@ class NearbySharingEventLoggerTest : public ::testing::Test {
 
  private:
   nearby::FakePreferenceManager preference_manager_;
-  MockEventLogger* raw_event_logger_ = nullptr;
+  std::unique_ptr<MockEventLogger> event_logger_;
   std::unique_ptr<NearbySharingEventLogger> sharing_event_logger_;
 };
 
diff --git a/sharing/nearby_sharing_service_factory.cc b/sharing/nearby_sharing_service_factory.cc
index 13d27201..dd27577c 100644
--- a/sharing/nearby_sharing_service_factory.cc
+++ b/sharing/nearby_sharing_service_factory.cc
@@ -47,18 +47,18 @@ NearbySharingService* NearbySharingServiceFactory::CreateSharingService(
 
   context_ =
       std::make_unique<ContextImpl>(sharing_platform);
-  event_logger_ = std::make_unique<NearbySharingEventLogger>(
-      sharing_platform.GetPreferenceManager(),
-      std::move(event_logger));
+  base_event_logger_ = std::move(event_logger);
+  sharing_event_logger_ = std::make_unique<NearbySharingEventLogger>(
+      sharing_platform.GetPreferenceManager(), base_event_logger_.get());
   decoder_ = std::make_unique<NearbySharingDecoderImpl>();
   nearby_connections_manager_ =
       NearbyConnectionsManagerFactory::CreateConnectionsManager(
           link_type, context_.get(), sharing_platform.GetDeviceInfo(),
-          event_logger_.get());
+          sharing_event_logger_.get());
 
   nearby_sharing_service_ = std::make_unique<NearbySharingServiceImpl>(
       context_.get(), sharing_platform, decoder_.get(),
-      std::move(nearby_connections_manager_), event_logger_.get());
+      std::move(nearby_connections_manager_), sharing_event_logger_.get());
 
   return nearby_sharing_service_.get();
 }
diff --git a/sharing/nearby_sharing_service_factory.h b/sharing/nearby_sharing_service_factory.h
index 85b4ef4c..4cc42ab9 100644
--- a/sharing/nearby_sharing_service_factory.h
+++ b/sharing/nearby_sharing_service_factory.h
@@ -37,13 +37,14 @@ class NearbySharingServiceFactory {
   NearbySharingService* CreateSharingService(
       LinkType link_type,
       nearby::sharing::api::SharingPlatform& sharing_platform,
-      std::unique_ptr<::nearby::analytics::EventLogger> event_logger = nullptr);
+      std::unique_ptr<::nearby::analytics::EventLogger> event_logger);
 
  private:
   NearbySharingServiceFactory() = default;
 
   std::unique_ptr<Context> context_;
-  std::unique_ptr<::nearby::analytics::EventLogger> event_logger_;
+  std::unique_ptr<::nearby::analytics::EventLogger> base_event_logger_;
+  std::unique_ptr<::nearby::analytics::EventLogger> sharing_event_logger_;
   std::unique_ptr<NearbySharingDecoder> decoder_;
   std::unique_ptr<NearbyConnectionsManager> nearby_connections_manager_;
   std::unique_ptr<NearbySharingService> nearby_sharing_service_;