Change InterfaceFactory<I>::Create() to take a ConnectionContext instead of an ApplicationConnectio…

services/log/log_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_timeouts.h"
 #include "mojo/public/c/environment/logger.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/connection_context.h"
 #include "mojo/public/cpp/system/time.h"
 #include "mojo/services/log/interfaces/entry.mojom.h"
 #include "mojo/services/log/interfaces/log.mojom.h"
 #include "services/log/log_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace log {
 namespace {
 
 using base::MessageLoop;
 using LogImplTest = mojo::test::ApplicationTestBase;
 
-// We need to supply a ApplicationConnection to LogImpl::Create().
-class TestApplicationConnection : public ApplicationConnection {
- public:
-  TestApplicationConnection()
-      : connection_context_(ConnectionContext::Type::INCOMING,
-                            "mojo:log_impl_unittest",
-                            "mojo:log") {}
-
-  const ConnectionContext& GetConnectionContext() const override {
-    return connection_context_;
-  }
-
-  const std::string& GetConnectionURL() override {
-    return connection_context_.connection_url;
-  }
-
-  const std::string& GetRemoteApplicationURL() override {
-    return connection_context_.remote_url;
-  }
-
-  void SetServiceConnectorForName(ServiceConnector* service_connector,
-                                  const std::string& name) override {}
-
- private:
-  const ConnectionContext connection_context_;
-};
-
 // Tests the Log service implementation by calling its AddEntry and verifying
 // the log message that it "prints".
 TEST_F(LogImplTest, AddEntryOutput) {
   std::vector<std::string> messages;
 
   LogPtr log;
-  TestApplicationConnection app_connection;
+  ConnectionContext connection_context(ConnectionContext::Type::INCOMING,
+                                       "mojo:log_impl_unittest", "mojo:log");
   LogImpl::Create(
-      &app_connection, GetProxy(&log),
+      connection_context, GetProxy(&log),
       [&messages](const std::string& message) { messages.push_back(message); });
 
   Entry entry;
   entry.log_level = MOJO_LOG_LEVEL_INFO;
   entry.timestamp = GetTimeTicksNow();
   entry.source_file = "file.ext";
   entry.source_line = 0;
   entry.message = "1234567890";
   log->AddEntry(entry.Clone());
 
@@ skipping 19 matching lines @@
       "<mojo:log_impl_unittest> [INFO] file.ext:1: 1234567890",
       "<mojo:log_impl_unittest> [INFO] 1234567890",
       "<mojo:log_impl_unittest> [INFO] <no message>",
   };
   EXPECT_EQ(kExpectedMessages, messages);
 }
 
 }  // namespace
 }  // namespace log
 }  // namespace mojo