Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / libaddressinput / chromium / cpp / src / country_rules_aggregator.cc

diff --git a/src/third_party/libaddressinput/chromium/cpp/src/country_rules_aggregator.cc b/src/third_party/libaddressinput/chromium/cpp/src/country_rules_aggregator.cc
index 8135b3b..dbb913b 100644 (file)
--- a/src/third_party/libaddressinput/chromium/cpp/src/country_rules_aggregator.cc
+++ b/src/third_party/libaddressinput/chromium/cpp/src/country_rules_aggregator.cc
@@ -48,7 +48,7 @@ void CountryRulesAggregator::AggregateRules(const std::string& country_code,
                                             scoped_ptr<Callback> rules_ready) {
   Reset();
   country_code_ = country_code;
-  rules_ready_.reset(rules_ready.release());
+  rules_ready_ = rules_ready.Pass();
 
   // Key construction:
   // https://code.google.com/p/libaddressinput/wiki/AddressValidationMetadata
@@ -73,7 +73,8 @@ void CountryRulesAggregator::OnDataReady(bool success,
   }
 
   scoped_ptr<Ruleset> ruleset = Build(key_, COUNTRY);
-  (*rules_ready_)(ruleset != NULL, country_code_, ruleset.Pass());
+  const bool parse_success = ruleset != NULL;
+  (*rules_ready_)(parse_success, country_code_, ruleset.Pass());
   Reset();
 }