| Index: chrome/browser/component_updater/test/test_installer.cc
|
| diff --git a/chrome/browser/component_updater/test/test_installer.cc b/chrome/browser/component_updater/test/test_installer.cc
|
| index 2f1a7bc3861f0b23914063414523429a90664c4c..7d1a2100f48e934db2a144df546ffc6ddb1e52de 100644
|
| --- a/chrome/browser/component_updater/test/test_installer.cc
|
| +++ b/chrome/browser/component_updater/test/test_installer.cc
|
| @@ -4,15 +4,14 @@
|
|
|
| #include "chrome/browser/component_updater/test/test_installer.h"
|
|
|
| -#include <string>
|
| -
|
| #include "base/file_util.h"
|
| #include "base/files/file_path.h"
|
| #include "base/values.h"
|
|
|
| namespace component_updater {
|
|
|
| -TestInstaller::TestInstaller() : error_(0), install_count_(0) {
|
| +TestInstaller::TestInstaller()
|
| + : error_(0), install_count_(0) {
|
| }
|
|
|
| void TestInstaller::OnUpdateError(int error) {
|
| @@ -25,18 +24,19 @@ bool TestInstaller::Install(const base::DictionaryValue& manifest,
|
| return base::DeleteFile(unpack_path, true);
|
| }
|
|
|
| +void TestInstaller::OnInstallError(
|
| + const InstallerSourceSerializer& serializer) {
|
| +}
|
| +
|
| bool TestInstaller::GetInstalledFile(const std::string& file,
|
| base::FilePath* installed_file) {
|
| return false;
|
| }
|
|
|
| -int TestInstaller::error() const {
|
| - return error_;
|
| -}
|
| +int TestInstaller::error() const { return error_; }
|
| +
|
| +int TestInstaller::install_count() const { return install_count_; }
|
|
|
| -int TestInstaller::install_count() const {
|
| - return install_count_;
|
| -}
|
|
|
| ReadOnlyTestInstaller::ReadOnlyTestInstaller(const base::FilePath& install_dir)
|
| : install_directory_(install_dir) {
|
| @@ -51,6 +51,7 @@ bool ReadOnlyTestInstaller::GetInstalledFile(const std::string& file,
|
| return true;
|
| }
|
|
|
| +
|
| VersionedTestInstaller::VersionedTestInstaller() {
|
| base::CreateNewTempDirectory(FILE_PATH_LITERAL("TEST_"), &install_directory_);
|
| }
|
| @@ -59,6 +60,7 @@ VersionedTestInstaller::~VersionedTestInstaller() {
|
| base::DeleteFile(install_directory_, true);
|
| }
|
|
|
| +
|
| bool VersionedTestInstaller::Install(const base::DictionaryValue& manifest,
|
| const base::FilePath& unpack_path) {
|
| std::string version_string;
|
| @@ -84,3 +86,4 @@ bool VersionedTestInstaller::GetInstalledFile(const std::string& file,
|
| }
|
|
|
| } // namespace component_updater
|
| +
|
|
|