[tracing] Add memory dump config to TraceConfig

content/browser/tracing/memory_tracing_browsertest.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/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/memory_dump_provider.h"
@@ skipping 69 matching lines @@
 
   void TearDown() override {
     MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
         mock_dump_provider_.get());
     mock_dump_provider_.reset();
     ContentBrowserTest::TearDown();
   }
 
   void EnableMemoryTracing() {
     base::RunLoop run_loop;
-    std::string category_filter = MemoryDumpManager::kTraceCategoryForTesting;
+    std::string category_filter = MemoryDumpManager::kTraceCategory;
     base::trace_event::TraceConfig trace_config(category_filter, "");
     bool success = TracingController::GetInstance()->EnableRecording(
       trace_config, run_loop.QuitClosure());
     EXPECT_TRUE(success);
     run_loop.Run();
   }
 
   void DisableTracing() {
     bool success = TracingController::GetInstance()->DisableRecording(NULL);
     EXPECT_TRUE(success);
@@ skipping 111 matching lines @@
 
   EnableMemoryTracing();
   RequestGlobalDumpAndWait(false /* from_renderer_thread */);
   EXPECT_EQ(1u, callback_call_count_);
   EXPECT_NE(0u, last_callback_dump_guid_);
   EXPECT_TRUE(last_callback_success_);
   DisableTracing();
 }
 
 }  // namespace content