1 files changed, 6 insertions, 8 deletions
diff --git a/cpp/test/null_storage_test.cc b/cpp/test/null_storage_test.cc
index 82ad0f5..8284554 100644
--- a/cpp/test/null_storage_test.cc
+++ b/cpp/test/null_storage_test.cc
@@ -26,24 +26,23 @@
 
 namespace {
 
+using i18n::addressinput::BuildCallback;
 using i18n::addressinput::NullStorage;
 using i18n::addressinput::scoped_ptr;
 using i18n::addressinput::Storage;
 
 class NullStorageTest : public testing::Test {
  protected:
-  NullStorageTest() {}
-  virtual ~NullStorageTest() {}
+  NullStorageTest()
+      : data_ready_(BuildCallback(this, &NullStorageTest::OnDataReady)) {}
 
-  Storage::Callback* BuildCallback() {
-    return i18n::addressinput::BuildCallback(
-        this, &NullStorageTest::OnDataReady);
-  }
+  virtual ~NullStorageTest() {}
 
   NullStorage storage_;
   bool success_;
   std::string key_;
   std::string data_;
+  const scoped_ptr<const Storage::Callback> data_ready_;
 
   static const char kKey[];
 
@@ -70,8 +69,7 @@ TEST_F(NullStorageTest, Put) {
 }
 
 TEST_F(NullStorageTest, Get) {
-  const scoped_ptr<const Storage::Callback> callback(BuildCallback());
-  storage_.Get(kKey, *callback);
+  storage_.Get(kKey, *data_ready_);
   EXPECT_FALSE(success_);
   EXPECT_EQ(kKey, key_);
   EXPECT_TRUE(data_.empty());