[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

content/browser/tracing/background_tracing_manager_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TRACING_BACKGROUND_TRACING_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_TRACING_BACKGROUND_TRACING_MANAGER_IMPL_H_
 
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 16 matching lines @@
   void TriggerNamedEvent(TriggerHandle, StartedFinalizingCallback) override;
   TriggerHandle RegisterTriggerType(const char* trigger_name) override;
   void GetTriggerNameList(std::vector<std::string>* trigger_names) override;
 
   void InvalidateTriggerHandlesForTesting() override;
 
  private:
   BackgroundTracingManagerImpl();
   ~BackgroundTracingManagerImpl() override;
 
-  void EnableRecording(base::trace_event::CategoryFilter);
+  void EnableRecording(std::string category_filter_str);
   void EnableRecordingIfConfigNeedsIt();
   void OnFinalizeStarted(scoped_refptr<base::RefCountedString>);
   void OnFinalizeComplete();
   void BeginFinalizing(StartedFinalizingCallback);
 
   std::string GetTriggerNameFromHandle(TriggerHandle handle) const;
   bool IsTriggerHandleValid(TriggerHandle handle) const;
 
   bool IsAbleToTriggerTracing(TriggerHandle handle) const;
   bool IsSupportedConfig(BackgroundTracingConfig* config);
 
-  base::trace_event::CategoryFilter GetCategoryFilterForCategoryPreset(
+  std::string GetCategoryFilterStringForCategoryPreset(
       BackgroundTracingConfig::CategoryPreset) const;
 
   class TraceDataEndpointWrapper
       : public content::TracingController::TraceDataEndpoint {
    public:
     TraceDataEndpointWrapper(base::Callback<
         void(scoped_refptr<base::RefCountedString>)> done_callback);
 
     void ReceiveTraceFinalContents(const std::string& file_contents) override;
 
@@ skipping 16 matching lines @@
   IdleCallback idle_callback_;
 
   friend struct base::DefaultLazyInstanceTraits<BackgroundTracingManagerImpl>;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundTracingManagerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_TRACING_BACKGROUND_TRACING_MANAGER_IMPL_H_