Update from https://crrev.com/316786

net/base/trace_net_log_observer_unittest.cc

 // Copyright 2014 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 "net/base/trace_net_log_observer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "base/values.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/net_log.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::debug::TraceLog;
+using base::trace_event::TraceLog;
 
 namespace net {
 
 namespace {
 
 // TraceLog category for NetLog events.
 const char kNetLogTracingCategory[] = TRACE_DISABLED_BY_DEFAULT("netlog");
 
 struct TraceEntryInfo {
   std::string category;
@@ skipping 48 matching lines @@
     ASSERT_TRUE(trace_value->GetAsList(&trace_events));
 
     trace_events_ = FilterNetLogTraceEvents(*trace_events);
 
     if (!has_more_events)
       run_loop->Quit();
   }
 
   static void EnableTraceLog() {
     TraceLog::GetInstance()->SetEnabled(
-        base::debug::CategoryFilter(kNetLogTracingCategory),
+        base::trace_event::CategoryFilter(kNetLogTracingCategory),
         TraceLog::RECORDING_MODE,
-        base::debug::TraceOptions());
+        base::trace_event::TraceOptions());
   }
 
   void EndTraceAndFlush() {
     base::RunLoop run_loop;
     TraceLog::GetInstance()->SetDisabled();
     TraceLog::GetInstance()->Flush(
         base::Bind(&TraceNetLogObserverTest::OnTraceDataCollected,
                    base::Unretained(this),
                    base::Unretained(&run_loop)));
     run_loop.Run();
@@ skipping 32 matching lines @@
   CapturingNetLog* net_log() {
     return &net_log_;
   }
 
   TraceNetLogObserver* trace_net_log_observer() const {
     return trace_net_log_observer_.get();
   }
 
  private:
   scoped_ptr<base::ListValue> trace_events_;
-  base::debug::TraceResultBuffer trace_buffer_;
-  base::debug::TraceResultBuffer::SimpleOutput json_output_;
+  base::trace_event::TraceResultBuffer trace_buffer_;
+  base::trace_event::TraceResultBuffer::SimpleOutput json_output_;
   CapturingNetLog net_log_;
   scoped_ptr<TraceNetLogObserver> trace_net_log_observer_;
 };
 
 TEST_F(TraceNetLogObserverTest, TracingNotEnabled) {
   trace_net_log_observer()->WatchForTraceStart(net_log());
   net_log()->AddGlobalEntry(NetLog::TYPE_REQUEST_ALIVE);
 
   EndTraceAndFlush();
   trace_net_log_observer()->StopWatchForTraceStart();
@@ skipping 209 matching lines @@
   EXPECT_TRUE(item1->GetString("args.params.foo", &item1_params));
   EXPECT_EQ("bar", item1_params);
 
   EXPECT_TRUE(item2->GetString("args.params", &item2_params));
   EXPECT_TRUE(item2_params.empty());
 }
 
 }  // namespace
 
 }  // namespace net