Add ability for NetLogLogger to gather data from more than just NetLog

chrome/browser/extensions/api/log_private/log_private_api.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_LOG_PRIVATE_LOG_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_LOG_PRIVATE_LOG_PRIVATE_API_H_
 
 #include <set>
 #include <string>
 
+#include "base/files/scoped_file.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
 #include "chrome/browser/extensions/api/log_private/log_parser.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/feedback/system_logs/about_system_logs_fetcher.h"
 #include "chrome/common/extensions/api/log_private.h"
 #include "extensions/browser/api/api_resource.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_registry_observer.h"
@@ skipping 60 matching lines @@
   void OnExtensionUnloaded(content::BrowserContext* browser_context,
                            const Extension* extension,
                            UnloadedExtensionInfo::Reason reason) override;
 
   // ChromeNetLog::ThreadSafeObserver implementation:
   void OnAddEntry(const net::NetLog::Entry& entry) override;
 
   void PostPendingEntries();
   void AddEntriesOnUI(scoped_ptr<base::ListValue> value);
 
-  // Initializes a new instance of net::NetLogLogger and passes it back via
-  // |net_logger| param.
-  void InitializeNetLogger(const std::string& owner_extension_id,
-                           net::NetLogLogger** net_logger);
+  // Creates a file for use with a new instance of net::NetLogLogger.
+  void CreateFileForNetLogger(
+      const std::string& owner_extension_id, base::ScopedFILE* file);

[not at google - send to devlin, 2015/03/09 21:26:25]

FILE!!!!!!!!!

[mmenke, 2015/03/09 21:59:30]

The problem with that is it leaks the FILE* if the task doesn't run on the io
thread for some reason.  I suppose since we're using base::Unretained, we assume
that doesn't happen, or if it does, it only happens when the IO Thread shuts
down?  I'm not that strongly opposed to switching, if you want, but it doesn't
strike me as all that safe.

[not at google - send to devlin, 2015/03/09 22:03:38]

Oh sorry, that was supposed to be a joke. I'm using to seeing naming like
"ScopedFile" so when I see "ScopedFILE" it looks like somebody shouting "FILE"
(though I do understand the naming convention).

As for the code in question, if CreateFileForNetLogger takes ownership then it
makes sense to be Scoped, otherwise, less so - I was just considering my input
as a rubber stamp.

[mmenke, 2015/03/09 22:21:43]

Ahh, right.  I completely misunderstood.  :)  And yes, it takes ownership.

I kept on writing File everywhere when writing this CL, and shockingly, every
time I tried, I got a compile failure.  :(

 
   // Starts observing network events with a new |net_logger| instance.
-  void StartObservingNetEvents(IOThread* io_thread,
-                               net::NetLogLogger** net_logger);
+  void StartObservingNetEvents(IOThread* io_thread, base::ScopedFILE* file);
   void MaybeStartNetInternalLogging(const std::string& caller_extension_id,
                                     IOThread* io_thread,
                                     api::log_private::EventSink event_sink);
   void MaybeStopNetInternalLogging(const base::Closure& closure);
   void StopNetInternalLogging();
 
   // BrowserContextKeyedAPI implementation.
   static const char* service_name() {
     return "LogPrivateAPI";
   }
@@ skipping 83 matching lines @@
   // Callback for DebugLogWriter::StoreLogs() call.
   void OnStoreLogsCompleted(const base::FilePath& log_path, bool succeeded);
   // Callback for LogPrivateAPI::StopAllWatches() call.
   void OnStopAllWatches();
   DISALLOW_COPY_AND_ASSIGN(LogPrivateDumpLogsFunction);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_LOG_PRIVATE_LOG_PRIVATE_API_H_