[update_engine] Roll forward to new libchrome
BUG=chromium-os:14304
TEST=build, unit tests
Change-Id: Ic6bc4c27ade8f960b770cd766753d6e5729d4878
Reviewed-on: http://gerrit.chromium.org/gerrit/823
Reviewed-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/buffered_file_writer.h b/buffered_file_writer.h
index 0457285..a949c33 100644
--- a/buffered_file_writer.h
+++ b/buffered_file_writer.h
@@ -5,7 +5,7 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_BUFFERED_FILE_WRITER_H__
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_BUFFERED_FILE_WRITER_H__
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "update_engine/file_writer.h"
diff --git a/chrome_proxy_resolver.cc b/chrome_proxy_resolver.cc
index 1deab11..7d3676b 100644
--- a/chrome_proxy_resolver.cc
+++ b/chrome_proxy_resolver.cc
@@ -5,7 +5,7 @@
#include "update_engine/chrome_proxy_resolver.h"
#include <base/json/json_reader.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <base/values.h>
#include "update_engine/utils.h"
diff --git a/delta_performer.cc b/delta_performer.cc
index b5d1cff..9978faf 100644
--- a/delta_performer.cc
+++ b/delta_performer.cc
@@ -12,7 +12,7 @@
#include <string>
#include <vector>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
#include <google/protobuf/repeated_field.h>
diff --git a/delta_performer_unittest.cc b/delta_performer_unittest.cc
index 9c926d5..df73e56 100644
--- a/delta_performer_unittest.cc
+++ b/delta_performer_unittest.cc
@@ -10,7 +10,7 @@
#include <vector>
#include <base/file_util.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
#include <google/protobuf/repeated_field.h>
#include <gtest/gtest.h>
diff --git a/download_action.h b/download_action.h
index 3a7dfe8..dcdc6fb 100644
--- a/download_action.h
+++ b/download_action.h
@@ -11,7 +11,7 @@
#include <string>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <curl/curl.h>
#include <google/protobuf/stubs/common.h>
diff --git a/generate_delta_main.cc b/generate_delta_main.cc
index 3460998..1e4d856 100644
--- a/generate_delta_main.cc
+++ b/generate_delta_main.cc
@@ -156,7 +156,8 @@
logging::InitLogging("delta_generator.log",
logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
logging::DONT_LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE);
+ logging::APPEND_TO_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
if (FLAGS_signature_size > 0 || !FLAGS_out_hash_file.empty()) {
CalculatePayloadHashForSigning();
return 0;
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index 8170b7b..a6c3f73 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -9,7 +9,7 @@
#include <vector>
#include <base/logging.h>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <base/string_util.h>
#include <glib.h>
#include <gtest/gtest.h>
diff --git a/main.cc b/main.cc
index 769850c..7d6babf 100644
--- a/main.cc
+++ b/main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -121,7 +121,8 @@
logging::InitLogging(NULL,
logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
logging::DONT_LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE);
+ logging::APPEND_TO_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
if (FLAGS_logtostderr) {
return;
}
@@ -129,7 +130,8 @@
logging::InitLogging(log_file.c_str(),
logging::LOG_ONLY_TO_FILE,
logging::DONT_LOCK_LOG_FILE,
- logging::APPEND_TO_OLD_LOG_FILE);
+ logging::APPEND_TO_OLD_LOG_FILE,
+ logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
}
} // namespace {}
diff --git a/multi_range_http_fetcher.h b/multi_range_http_fetcher.h
index 8a54bde..1127568 100644
--- a/multi_range_http_fetcher.h
+++ b/multi_range_http_fetcher.h
@@ -9,7 +9,7 @@
#include <utility>
#include <vector>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include "update_engine/http_fetcher.h"
diff --git a/omaha_request_action.h b/omaha_request_action.h
index fd7f548..753ab57 100644
--- a/omaha_request_action.h
+++ b/omaha_request_action.h
@@ -11,7 +11,7 @@
#include <string>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <curl/curl.h>
#include "update_engine/action.h"
diff --git a/payload_signer.cc b/payload_signer.cc
index ef9791d..f613f36 100644
--- a/payload_signer.cc
+++ b/payload_signer.cc
@@ -5,6 +5,7 @@
#include "update_engine/payload_signer.h"
#include <base/logging.h>
+#include <base/string_split.h>
#include <base/string_util.h>
#include <openssl/pem.h>
@@ -146,9 +147,9 @@
// This runs on the server, so it's okay to cop out and call openssl
// executable rather than properly use the library
vector<string> cmd;
- SplitString("/usr/bin/openssl rsautl -raw -sign -inkey x -in x -out x",
- ' ',
- &cmd);
+ base::SplitString("/usr/bin/openssl rsautl -raw -sign -inkey x -in x -out x",
+ ' ',
+ &cmd);
cmd[cmd.size() - 5] = private_key_path;
cmd[cmd.size() - 3] = hash_path;
cmd[cmd.size() - 1] = sig_path;
diff --git a/simple_key_value_store.cc b/simple_key_value_store.cc
index 0315045..78e191e 100644
--- a/simple_key_value_store.cc
+++ b/simple_key_value_store.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,6 +6,7 @@
#include <map>
#include <string>
#include <vector>
+#include "base/string_split.h"
#include "base/string_util.h"
using std::map;
@@ -20,7 +21,7 @@
// Split along '\n', then along '='
std::map<std::string, std::string> ret;
vector<string> lines;
- SplitStringDontTrim(str, '\n', &lines);
+ base::SplitStringDontTrim(str, '\n', &lines);
for (vector<string>::const_iterator it = lines.begin();
it != lines.end(); ++it) {
string::size_type pos = it->find('=');
diff --git a/subprocess.cc b/subprocess.cc
index f6c1e3d..7b84e84 100644
--- a/subprocess.cc
+++ b/subprocess.cc
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <vector>
#include "base/logging.h"
-#include "base/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
using std::string;
diff --git a/test_utils.h b/test_utils.h
index 68de48d..2283e6a 100644
--- a/test_utils.h
+++ b/test_utils.h
@@ -9,7 +9,7 @@
#include <string>
#include <vector>
-#include <base/scoped_ptr.h>
+#include <base/memory/scoped_ptr.h>
#include <gtest/gtest.h>
#include "update_engine/action.h"