[Courgette] Reduce AssemblyProgram to reduce Courgette-apply RAM floor and disk churn.

courgette/encode_decode_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 <stddef.h>
 
 #include <memory>
 
-#include "courgette/assembly_program.h"
 #include "courgette/base_test_unittest.h"
 #include "courgette/courgette.h"
 #include "courgette/courgette_flow.h"
-#include "courgette/encoded_program.h"
-#include "courgette/program_detector.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 class EncodeDecodeTest : public BaseTest {
  public:
   void TestAssembleToStreamDisassemble(const std::string& file,
                                        size_t expected_encoded_length) const;
 };
 
 void EncodeDecodeTest::TestAssembleToStreamDisassemble(
     const std::string& file,
     size_t expected_encoded_length) const {
   const uint8_t* original_data = reinterpret_cast<const uint8_t*>(file.data());
   size_t original_length = file.length();
   CourgetteFlow flow;
 
   // Convert executable to encoded assembly.
   RegionBuffer original_buffer(Region(original_data, original_length));
-  flow.ReadAssemblyProgramFromBuffer(flow.ONLY, original_buffer, false);
+  flow.ReadDisassemblerFromBuffer(flow.ONLY, original_buffer);
+  EXPECT_EQ(C_OK, flow.status());
+  EXPECT_TRUE(nullptr != flow.data(flow.ONLY)->disassembler.get());
+
+  flow.CreateAssemblyProgramFromDisassembler(flow.ONLY, false);
   EXPECT_EQ(C_OK, flow.status());
   EXPECT_TRUE(nullptr != flow.data(flow.ONLY)->program.get());
 
-  flow.CreateEncodedProgramFromAssemblyProgram(flow.ONLY);
+  flow.CreateEncodedProgramFromDisassemblerAndAssemblyProgram(flow.ONLY);
   EXPECT_EQ(C_OK, flow.status());
   EXPECT_TRUE(nullptr != flow.data(flow.ONLY)->encoded.get());
 
   flow.DestroyAssemblyProgram(flow.ONLY);
   EXPECT_EQ(C_OK, flow.status());
   EXPECT_TRUE(nullptr == flow.data(flow.ONLY)->program.get());
 
+  flow.DestroyDisassembler(flow.ONLY);
+  EXPECT_EQ(C_OK, flow.status());
+  EXPECT_TRUE(nullptr == flow.data(flow.ONLY)->disassembler.get());
+
   flow.WriteSinkStreamSetFromEncodedProgram(flow.ONLY);
   EXPECT_EQ(C_OK, flow.status());
 
   flow.DestroyEncodedProgram(flow.ONLY);
   EXPECT_EQ(C_OK, flow.status());
   EXPECT_TRUE(nullptr == flow.data(flow.ONLY)->encoded.get());
 
   SinkStream sink;
   flow.WriteSinkStreamFromSinkStreamSet(flow.ONLY, &sink);
   EXPECT_EQ(C_OK, flow.status());
@@ skipping 47 matching lines @@
   std::string file = FileContents("elf-32-high-bss");
   TestAssembleToStreamDisassemble(file, 7308);
 }
 
 TEST_F(EncodeDecodeTest, Elf_Arm) {
   std::string file = FileContents("elf-armv7");
   TestAssembleToStreamDisassemble(file, 8531);
 }
 
 }  // namespace courgette