update_engine: Fix all the "using" declaration usage.
This patch removes unused "using" declarations, that is, declarations
included in a .cc file at a global scope such that "using foo::bar"
that later don't use the identifier "bar" at all.
This also unifies the usage of these identifiers in the .cc files
in favor of using the short name defined by the using declaration.
For example, in several cases the .h refer to a type like
"std::string" because using declarations are forbidden in header
files while the .cc includes "using std::string;" with the purpose
of just writting "string" in the .cc file. Very rarely, the full
identifier is used when a local name ocludes it, for example,
StringVectorToGStrv() and StringVectorToString() in utils.cc named
its argument just "vector" need to refer to std::vector with the
full name. This patch renames those arguments instead.
Finally, it also sorts a few lists of using declarations that weren't
in order.
BUG=None
TEST=FEATURES=test emerge-link update_engine
Change-Id: I30f6b9510ecb7e03640f1951c48d5bb106309840
Reviewed-on: https://chromium-review.googlesource.com/226423
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Alex Deymo <deymo@chromium.org>
Tested-by: Alex Deymo <deymo@chromium.org>
diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index 2a4a0ea..7cef85a 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -50,8 +50,8 @@
"stable-channel",
};
-bool OmahaRequestParams::Init(const std::string& in_app_version,
- const std::string& in_update_url,
+bool OmahaRequestParams::Init(const string& in_app_version,
+ const string& in_update_url,
bool in_interactive) {
LOG(INFO) << "Initializing parameters for this update attempt";
InitFromLsbValue();
@@ -124,7 +124,7 @@
};
}
-bool OmahaRequestParams::SetTargetChannel(const std::string& new_target_channel,
+bool OmahaRequestParams::SetTargetChannel(const string& new_target_channel,
bool is_powerwash_allowed) {
LOG(INFO) << "SetTargetChannel called with " << new_target_channel
<< ", Is Powerwash Allowed = "
@@ -249,11 +249,11 @@
system_state_->hardware()->IsNormalBootMode();
}
-bool OmahaRequestParams::IsValidChannel(const std::string& channel) const {
+bool OmahaRequestParams::IsValidChannel(const string& channel) const {
return GetChannelIndex(channel) >= 0;
}
-void OmahaRequestParams::set_root(const std::string& root) {
+void OmahaRequestParams::set_root(const string& root) {
root_ = root;
InitFromLsbValue();
}
@@ -263,7 +263,7 @@
forced_lock_down_ = lock;
}
-int OmahaRequestParams::GetChannelIndex(const std::string& channel) const {
+int OmahaRequestParams::GetChannelIndex(const string& channel) const {
for (size_t t = 0; t < arraysize(kChannelsByStability); ++t)
if (channel == kChannelsByStability[t])
return t;