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

base/trace_event/memory_dump_manager_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 "base/trace_event/memory_dump_manager.h"
 
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 46 matching lines @@
                            uint64 dump_guid,
                            bool success) {
     task_runner->PostTask(FROM_HERE, closure);
   }
 
  protected:
   const char* kTraceCategory = MemoryDumpManager::kTraceCategoryForTesting;
 
   void EnableTracing(const char* category) {
     TraceLog::GetInstance()->SetEnabled(
-        CategoryFilter(category), TraceLog::RECORDING_MODE, TraceOptions());
+        TraceConfig(category, ""), TraceLog::RECORDING_MODE);

[dsinclair, 2015/06/02 13:56:54]

Can we add a default value of "" to the trace config for trace options so we
don't have to pass , "" everywhere?

[Zhen Wang, 2015/06/02 16:24:41]

TraceConfig has the following two constructors

1. TraceConfig(const std::string&, const std::string&);
This is for category filter string and trace options string

2. explicit TraceConfig(const std::string&);
This is for trace config string (JSON format)

Using the default value "" for trace options will not work.


One way to solve this is to change

explicit TraceConfig(const std::string&);

to

explicit TraceConfig(scoped_ptr<base::Value> value);

where |value| is the parsed values from the JSON formatted config string. This
requires parsing the config string outside of TraceConfig class.

How do you think?

   }
 
   void DisableTracing() { TraceLog::GetInstance()->SetDisabled(); }
 
   scoped_ptr<MemoryDumpManager> mdm_;
 
  private:
   scoped_ptr<MessageLoop> message_loop_;
   MemoryDumpManagerDelegateForTesting delegate_;
 
@@ skipping 189 matching lines @@
 
   EXPECT_CALL(mdp1, OnMemoryDump(_)).Times(0);
   EXPECT_CALL(mdp2, OnMemoryDump(_)).Times(1).WillRepeatedly(Return(false));
   mdm_->RequestGlobalDump(MemoryDumpType::EXPLICITLY_TRIGGERED);
 
   DisableTracing();
 }
 
 }  // namespace trace_event
 }  // namespace base