Rename SingleLogSource to SingleLogFileLogSource

chrome/browser/extensions/api/feedback_private/log_source_access_manager_chromeos_unittest.cc

 // Copyright 2017 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 "chrome/browser/extensions/api/feedback_private/log_source_access_manager.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/feedback_private/log_source_resource.h"
 #include "chrome/browser/extensions/api/feedback_private/single_log_source_factory.h"
 #include "chrome/browser/extensions/extension_api_unittest.h"
 #include "extensions/browser/api/api_resource_manager.h"
 
 namespace extensions {
 
 namespace {
 
 using api::feedback_private::LOG_SOURCE_MESSAGES;
 using api::feedback_private::LOG_SOURCE_UILATEST;
+using api::feedback_private::LogSource;
 using api::feedback_private::ReadLogSourceResult;
 using api::feedback_private::ReadLogSourceParams;
-using system_logs::SingleLogSource;
-using SupportedSource = system_logs::SingleLogSource::SupportedSource;
+using system_logs::SystemLogsSource;
 
 std::unique_ptr<KeyedService> ApiResourceManagerTestFactory(
     content::BrowserContext* context) {
   return base::MakeUnique<ApiResourceManager<LogSourceResource>>(context);
 }
 
 // Dummy function used as a callback for FetchFromSource().
 void OnFetchedFromSource(const ReadLogSourceResult& result) {}
 
-// A dummy SingleLogSource that does not require real system logs to be
+// A dummy SystemLogsSource that does not require real system logs to be
 // available during testing. Always returns an empty result.
-class EmptySingleLogSource : public SingleLogSource {
+class EmptySingleLogSource : public system_logs::SystemLogsSource {
  public:
-  explicit EmptySingleLogSource(SupportedSource type) : SingleLogSource(type) {}
+  explicit EmptySingleLogSource(LogSource type)
+      : SystemLogsSource(api::feedback_private::ToString(type)) {}
 
   ~EmptySingleLogSource() override = default;
 
   void Fetch(const system_logs::SysLogsSourceCallback& callback) override {
     system_logs::SystemLogsResponse* result_map =
         new system_logs::SystemLogsResponse;
     result_map->emplace("", "");
 
     // Do not directly pass the result to the callback, because that's not how
     // log sources actually work. Instead, simulate the asynchronous operation
-    // of a SingleLogSource by invoking the callback separately.
+    // of a SystemLogsSource by invoking the callback separately.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, base::Owned(result_map)));
   }
 
   // Instantiates a new instance of this class. Does not retain ownership. Used
   // to create a Callback that can be used to override the default behavior of
   // SingleLogSourceFactory.
-  static std::unique_ptr<SingleLogSource> Create(SupportedSource type) {
-    return base::MakeUnique<EmptySingleLogSource>(type);
+  static std::unique_ptr<SystemLogsSource> Create(LogSource type) {
+    return std::unique_ptr<SystemLogsSource>(new EmptySingleLogSource(type));

[afakhry, 2017/06/24 00:10:16]

By the way MakeUnique<EmptySingleLogSource> should work here. Is it not?

[Simon Que, 2017/07/10 14:10:13]

Done.

   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptySingleLogSource);
 };
 
 }  // namespace
 
 class LogSourceAccessManagerTest : public ExtensionApiUnittest {
  public:
@@ skipping 80 matching lines @@
         << count;
   }
   EXPECT_EQ(10U, manager.GetNumActiveResourcesForSource(LOG_SOURCE_MESSAGES));
   EXPECT_EQ(10U, manager.GetNumActiveResourcesForSource(LOG_SOURCE_UILATEST));
 
   // Wait for all asynchronous operations to complete.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace extensions