libaddressinput - reduce number of copies in storage class by 2

third_party/libaddressinput/chromium/cpp/test/retriever_test.cc

 // Copyright (C) 2013 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 26 matching lines @@
 
 const char kKey[] = "data/CA";
 
 // Empty data that the downloader can return.
 const char kEmptyData[] = "{}";
 
 // The MD5 checksum for kEmptyData. Retriever uses MD5 to validate data
 // integrity.
 const char kEmptyDataChecksum[] = "99914b932bd37a50b983c5e7c90ae93b";
 
-std::string Wrap(const std::string& data,
-                 const std::string& checksum,
-                 const std::string& timestamp) {
-  return data + "\n" + "checksum=" + checksum + "\n" + "timestamp=" + timestamp;
+scoped_ptr<std::string> Wrap(const std::string& data,
+                             const std::string& checksum,
+                             const std::string& timestamp) {
+  return make_scoped_ptr(new std::string(
+      data + "\n" + "checksum=" + checksum + "\n" + "timestamp=" + timestamp));
 }
 
 }  // namespace
 
 // Tests for Retriever object.
 class RetrieverTest : public testing::Test {
  protected:
   RetrieverTest()
       : storage_(NULL),
         retriever_(),
@@ skipping 102 matching lines @@
   const char kFallbackDataKey[] = "data/US";
   bad_retriever.Retrieve(kFallbackDataKey, BuildCallback());
 
   EXPECT_TRUE(success_);
   EXPECT_EQ(kFallbackDataKey, key_);
   EXPECT_FALSE(data_.empty());
   EXPECT_NE(kEmptyData, data_);
 }
 
 TEST_F(RetrieverTest, NoChecksumAndTimestampWillRedownload) {
-  storage_->Put(kKey, kEmptyData);
+  storage_->Put(kKey, make_scoped_ptr(new std::string(kEmptyData)));
   retriever_->Retrieve(kKey, BuildCallback());
   EXPECT_TRUE(success_);
   EXPECT_EQ(kKey, key_);
   EXPECT_FALSE(data_.empty());
   EXPECT_NE(kEmptyData, data_);
 }
 
 TEST_F(RetrieverTest, ChecksumAndTimestampWillNotRedownload) {
   storage_->Put(kKey,
                 Wrap(kEmptyData, kEmptyDataChecksum, TimeToString(time(NULL))));
@@ skipping 80 matching lines @@
 
 TEST_F(RetrieverTest, NullCallbackNoCrash) {
   ASSERT_NO_FATAL_FAILURE(
       retriever_->Retrieve(kKey, scoped_ptr<Retriever::Callback>()));
   ASSERT_NO_FATAL_FAILURE(
       retriever_->Retrieve(kKey, scoped_ptr<Retriever::Callback>()));
 }
 
 }  // namespace addressinput
 }  // namespace i18n