[Courgette] Refactor: Manage AssemblyProgram and EncodedProgram with scoped_ptr.

courgette/adjustment_method_unittest.cc

Index: courgette/adjustment_method_unittest.cc
diff --git a/courgette/adjustment_method_unittest.cc b/courgette/adjustment_method_unittest.cc
index 5b213dc4d95805f7373b7b6aecf2ba0f7ef6fc8b..e25a8e7271f2eeeb8f7a52914912121e4ea02256 100644
--- a/courgette/adjustment_method_unittest.cc
+++ b/courgette/adjustment_method_unittest.cc
@@ -3,11 +3,13 @@
 // found in the LICENSE file.
 
 #include <string>
+#include <utility>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
-
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
+#include "courgette/encoded_program.h"
 #include "courgette/streams.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
@@ -23,11 +25,11 @@ class AdjustmentMethodTest : public testing::Test {
   void TearDown() {
   }
 
-  // Returns one of two similar a simple programs.  They differ only in the
-  // label assignment, so that it is possible to make them look identical.
-  courgette::AssemblyProgram* MakeProgram(int kind) const {
-    courgette::AssemblyProgram* prog =
-      new courgette::AssemblyProgram(courgette::EXE_WIN_32_X86);
+  // Returns one of two similar simple programs. These differ only in Label
+  // assignment, so it is possible to make them look identical.
+  scoped_ptr<courgette::AssemblyProgram> MakeProgram(int kind) const {
+    scoped_ptr<courgette::AssemblyProgram> prog(
+      new courgette::AssemblyProgram(courgette::EXE_WIN_32_X86));
     prog->set_image_base(0x00400000);
 
     courgette::Label* labelA = prog->FindOrMakeAbs32Label(0x00410000);
@@ -52,24 +54,29 @@ class AdjustmentMethodTest : public testing::Test {
     return prog;
   }
 
-  courgette::AssemblyProgram* MakeProgramA() const { return MakeProgram(0); }
-  courgette::AssemblyProgram* MakeProgramB() const { return MakeProgram(1); }
+  scoped_ptr<courgette::AssemblyProgram> MakeProgramA() const {
+    return MakeProgram(0);
+  }
+  scoped_ptr<courgette::AssemblyProgram> MakeProgramB() const {
+    return MakeProgram(1);
+  }
 
   // Returns a string that is the serialized version of |program|.
   // Deletes |program|.
-  std::string Serialize(courgette::AssemblyProgram *program) const {
-    courgette::EncodedProgram* encoded = NULL;
+  std::string Serialize(scoped_ptr<courgette::AssemblyProgram> program) const {
+    scoped_ptr<courgette::EncodedProgram> encoded;
 
-    const courgette::Status encode_status = Encode(program, &encoded);
+    const courgette::Status encode_status = Encode(*program, &encoded);
     EXPECT_EQ(courgette::C_OK, encode_status);
 
-    DeleteAssemblyProgram(program);
+    program.reset();
 
     courgette::SinkStreamSet sinks;
-    const courgette::Status write_status = WriteEncodedProgram(encoded, &sinks);
+    const courgette::Status write_status =
+        WriteEncodedProgram(encoded.get(), &sinks);
     EXPECT_EQ(courgette::C_OK, write_status);
 
-    DeleteEncodedProgram(encoded);
+    encoded.reset();
 
     courgette::SinkStream sink;
     bool can_collect = sinks.CopyTo(&sink);
@@ -82,20 +89,20 @@ class AdjustmentMethodTest : public testing::Test {
 
 
 void AdjustmentMethodTest::Test1() const {
-  courgette::AssemblyProgram* prog1 = MakeProgramA();
-  courgette::AssemblyProgram* prog2 = MakeProgramB();
-  std::string s1 = Serialize(prog1);
-  std::string s2 = Serialize(prog2);
+  scoped_ptr<courgette::AssemblyProgram> prog1 = MakeProgramA();
+  scoped_ptr<courgette::AssemblyProgram> prog2 = MakeProgramB();
+  std::string s1 = Serialize(std::move(prog1));
+  std::string s2 = Serialize(std::move(prog2));
 
   // Don't use EXPECT_EQ because strings are unprintable.
   EXPECT_FALSE(s1 == s2);  // Unadjusted A and B differ.
 
-  courgette::AssemblyProgram* prog5 = MakeProgramA();
-  courgette::AssemblyProgram* prog6 = MakeProgramB();
-  courgette::Status can_adjust = Adjust(*prog5, prog6);
+  scoped_ptr<courgette::AssemblyProgram> prog5 = MakeProgramA();
+  scoped_ptr<courgette::AssemblyProgram> prog6 = MakeProgramB();
+  courgette::Status can_adjust = Adjust(*prog5, prog6.get());
   EXPECT_EQ(courgette::C_OK, can_adjust);
-  std::string s5 = Serialize(prog5);
-  std::string s6 = Serialize(prog6);
+  std::string s5 = Serialize(std::move(prog5));
+  std::string s6 = Serialize(std::move(prog6));
 
   EXPECT_TRUE(s1 == s5);  // Adjustment did not change A (prog5)
   EXPECT_TRUE(s5 == s6);  // Adjustment did change B into A