Update from https://crrev.com/312398

gpu/command_buffer/service/gpu_tracer_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 <map>
 #include <set>
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_tracer.h"
@@ skipping 32 matching lines @@
   int64 current_cpu_time_;
 };
 
 class MockOutputter : public Outputter {
  public:
   MockOutputter() {}
   MOCK_METHOD4(TraceDevice,
                void(const std::string& category, const std::string& name,
                     int64 start_time, int64 end_time));
 
-  MOCK_METHOD3(TraceServiceBegin,
-               void(const std::string& category, const std::string& name,
-                    void* id));
+  MOCK_METHOD2(TraceServiceBegin,
+               void(const std::string& category, const std::string& name));
 
-  MOCK_METHOD3(TraceServiceEnd,
-               void(const std::string& category, const std::string& name,
-                    void* id));
+  MOCK_METHOD2(TraceServiceEnd,
+               void(const std::string& category, const std::string& name));
 
  protected:
   ~MockOutputter() {}
 };
 
 class GlFakeQueries {
  public:
   GlFakeQueries() {}
 
   void Reset() {
@@ skipping 210 matching lines @@
       EXPECT_CALL(*gl_, DeleteQueriesARB(2, NotNull())).Times(AtLeast(1))
           .WillRepeatedly(
                Invoke(&gl_fake_queries_, &GlFakeQueries::DeleteQueriesARB));
     }
   }
 
   void ExpectOutputterBeginMocks(MockOutputter* outputter,
                                  const std::string& category,
                                  const std::string& name) {
     EXPECT_CALL(*outputter,
-                TraceServiceBegin(category, name, NotNull()));
+                TraceServiceBegin(category, name));
   }
 
   void ExpectOutputterEndMocks(MockOutputter* outputter,
                                const std::string& category,
                                const std::string& name, int64 expect_start_time,
                                int64 expect_end_time,
                                bool trace_device) {
     EXPECT_CALL(*outputter,
-                TraceServiceEnd(category, name, NotNull()));
+                TraceServiceEnd(category, name));
 
     if (trace_device) {
       EXPECT_CALL(*outputter,
                   TraceDevice(category, name,
                               expect_start_time, expect_end_time))
           .Times(Exactly(1));
     } else {
       EXPECT_CALL(*outputter, TraceDevice(category, name,
                                           expect_start_time, expect_end_time))
           .Times(Exactly(0));
@@ skipping 381 matching lines @@
                                    kTraceGroupMarker));
 
   ASSERT_TRUE(tracer_tester.BeginDecoding());
   EXPECT_TRUE(tracer_tester.Begin(category_name, trace_name,
                                   kTraceGroupMarker));
   ASSERT_TRUE(tracer_tester.EndDecoding());
 }
 
 }  // namespace gles2
 }  // namespace gpu