Remove BindStateHolder and have Bind() return a Callback<> object directly.

base/test/trace_event_analyzer_unittest.cc

 // Copyright (c) 2011 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/test/trace_event_analyzer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace trace_analyzer {
 
 namespace {
 
 class TraceEventAnalyzerTest : public testing::Test {
  public:
   void ManualSetUp();
   void OnTraceDataCollected(
-      scoped_refptr<base::debug::TraceLog::RefCountedString> json_events_str);
+      const scoped_refptr<base::debug::TraceLog::RefCountedString>&
+          json_events_str);
   void BeginTracing();
   void EndTracing();
 
   base::debug::TraceResultBuffer::SimpleOutput output_;
   base::debug::TraceResultBuffer buffer_;
 };
 
 void TraceEventAnalyzerTest::ManualSetUp() {
   base::debug::TraceLog::Resurrect();
   base::debug::TraceLog* tracelog = base::debug::TraceLog::GetInstance();
   ASSERT_TRUE(tracelog);
   tracelog->SetOutputCallback(
     base::Bind(&TraceEventAnalyzerTest::OnTraceDataCollected,
                base::Unretained(this)));
   buffer_.SetOutputCallback(output_.GetCallback());
   output_.json_output.clear();
 }
 
 void TraceEventAnalyzerTest::OnTraceDataCollected(
-    scoped_refptr<base::debug::TraceLog::RefCountedString> json_events_str) {
+    const scoped_refptr<base::debug::TraceLog::RefCountedString>&
+        json_events_str) {
   buffer_.AddFragment(json_events_str->data);
 }
 
 void TraceEventAnalyzerTest::BeginTracing() {
   output_.json_output.clear();
   buffer_.Start();
   base::debug::TraceLog::GetInstance()->SetEnabled(true);
 }
 
 void TraceEventAnalyzerTest::EndTracing() {
@@ skipping 553 matching lines @@
   TraceAnalyzer::TraceEventVector few_event_ptrs;
   few_event_ptrs.push_back(&event);
   few_event_ptrs.push_back(&event);
   ASSERT_FALSE(TraceAnalyzer::GetRateStats(few_event_ptrs, &stats));
   few_event_ptrs.push_back(&event);
   ASSERT_TRUE(TraceAnalyzer::GetRateStats(few_event_ptrs, &stats));
 }
 
 
 }  // namespace trace_analyzer
-