Componentize component_updater: Decouple in-process DeltaUpdateOp from out-of-process version.

chrome/browser/component_updater/test/component_patcher_unittest.cc

 // Copyright 2013 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/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_patcher.h"
 #include "chrome/browser/component_updater/component_patcher_operation.h"
+#include "chrome/browser/component_updater/component_patcher_operation_factory.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/test/component_patcher_unittest.h"
 #include "chrome/browser/component_updater/test/test_installer.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "courgette/courgette.h"
 #include "courgette/third_party/bsdiff.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 59 matching lines @@
   command_args->SetString("sha256", binary_output_hash);
   command_args->SetString("op", "create");
   command_args->SetString("patch", "binary_output.bin");
 
   TestCallback callback;
   scoped_refptr<DeltaUpdateOp> op = new DeltaUpdateOpCreate();
   op->Run(command_args.get(),
           input_dir_.path(),
           unpack_dir_.path(),
           NULL,
-          true,
           base::Bind(&TestCallback::Set, base::Unretained(&callback)),
           task_runner_);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(true, callback.called_);
   EXPECT_EQ(ComponentUnpacker::kNone, callback.error_);
   EXPECT_EQ(0, callback.extra_code_);
   EXPECT_TRUE(base::ContentsEqual(
       unpack_dir_.path().Append(FILE_PATH_LITERAL("output.bin")),
       test_file("binary_output.bin")));
@@ skipping 10 matching lines @@
   command_args->SetString("sha256", binary_output_hash);
   command_args->SetString("op", "copy");
   command_args->SetString("input", "binary_output.bin");
 
   TestCallback callback;
   scoped_refptr<DeltaUpdateOp> op = new DeltaUpdateOpCopy();
   op->Run(command_args.get(),
           input_dir_.path(),
           unpack_dir_.path(),
           installer_.get(),
-          true,
           base::Bind(&TestCallback::Set, base::Unretained(&callback)),
           task_runner_);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(true, callback.called_);
   EXPECT_EQ(ComponentUnpacker::kNone, callback.error_);
   EXPECT_EQ(0, callback.extra_code_);
   EXPECT_TRUE(base::ContentsEqual(
       unpack_dir_.path().Append(FILE_PATH_LITERAL("output.bin")),
       test_file("binary_output.bin")));
 }
 
 // Verify that a 'courgette' delta update operation works correctly.
 TEST_F(ComponentPatcherOperationTest, CheckCourgetteOperation) {
   EXPECT_TRUE(base::CopyFile(
       test_file("binary_input.bin"),
       installed_dir_.path().Append(FILE_PATH_LITERAL("binary_input.bin"))));
   EXPECT_TRUE(base::CopyFile(test_file("binary_courgette_patch.bin"),
                              input_dir_.path().Append(FILE_PATH_LITERAL(
                                  "binary_courgette_patch.bin"))));
 
   scoped_ptr<base::DictionaryValue> command_args(new base::DictionaryValue());
   command_args->SetString("output", "output.bin");
   command_args->SetString("sha256", binary_output_hash);
   command_args->SetString("op", "courgette");
   command_args->SetString("input", "binary_input.bin");
   command_args->SetString("patch", "binary_courgette_patch.bin");
 
   TestCallback callback;
-  scoped_refptr<DeltaUpdateOp> op = CreateDeltaUpdateOp("courgette");
+  scoped_ptr<DeltaUpdateOpFactory> factory(
+      CreateDeltaUpdateOpFactory(true /* in_process */));

[waffles, 2014/07/31 21:54:27]

Am I correct in thinking that this true no longer needs to be here?

[tommycli, 2014/08/04 20:25:14]

Done.

+  scoped_refptr<DeltaUpdateOp> op = factory->CreateDeltaUpdateOp("courgette");
   op->Run(command_args.get(),
           input_dir_.path(),
           unpack_dir_.path(),
           installer_.get(),
-          true,
           base::Bind(&TestCallback::Set, base::Unretained(&callback)),
           task_runner_);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(true, callback.called_);
   EXPECT_EQ(ComponentUnpacker::kNone, callback.error_);
   EXPECT_EQ(0, callback.extra_code_);
   EXPECT_TRUE(base::ContentsEqual(
       unpack_dir_.path().Append(FILE_PATH_LITERAL("output.bin")),
       test_file("binary_output.bin")));
 }
 
 // Verify that a 'bsdiff' delta update operation works correctly.
 TEST_F(ComponentPatcherOperationTest, CheckBsdiffOperation) {
   EXPECT_TRUE(base::CopyFile(
       test_file("binary_input.bin"),
       installed_dir_.path().Append(FILE_PATH_LITERAL("binary_input.bin"))));
   EXPECT_TRUE(base::CopyFile(
       test_file("binary_bsdiff_patch.bin"),
       input_dir_.path().Append(FILE_PATH_LITERAL("binary_bsdiff_patch.bin"))));
 
   scoped_ptr<base::DictionaryValue> command_args(new base::DictionaryValue());
   command_args->SetString("output", "output.bin");
   command_args->SetString("sha256", binary_output_hash);
   command_args->SetString("op", "courgette");
   command_args->SetString("input", "binary_input.bin");
   command_args->SetString("patch", "binary_bsdiff_patch.bin");
 
   TestCallback callback;
-  scoped_refptr<DeltaUpdateOp> op = CreateDeltaUpdateOp("bsdiff");
+  scoped_ptr<DeltaUpdateOpFactory> factory(
+      CreateDeltaUpdateOpFactory(true /* in_process */));
+  scoped_refptr<DeltaUpdateOp> op = factory->CreateDeltaUpdateOp("bsdiff");
   op->Run(command_args.get(),
           input_dir_.path(),
           unpack_dir_.path(),
           installer_.get(),
-          true,
           base::Bind(&TestCallback::Set, base::Unretained(&callback)),
           task_runner_);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(true, callback.called_);
   EXPECT_EQ(ComponentUnpacker::kNone, callback.error_);
   EXPECT_EQ(0, callback.extra_code_);
   EXPECT_TRUE(base::ContentsEqual(
       unpack_dir_.path().Append(FILE_PATH_LITERAL("output.bin")),
       test_file("binary_output.bin")));
 }
 
 }  // namespace component_updater