Remove deprecated AddressValidator constructor.

R=rouslan@chromium.org
BUG=

Review URL: https://codereview.appspot.com/101760044

git-svn-id: http://libaddressinput.googlecode.com/svn/trunk@253 38ededc0-08b8-5190-f2ac-b31f878777ad

2 files changed, 1 insertions, 32 deletions

diff --git a/cpp/include/libaddressinput/address_validator.h b/cpp/include/libaddressinput/address_validator.h
index b6abbc7..bd8d4e9 100644
--- a/cpp/include/libaddressinput/address_validator.h
+++ b/cpp/include/libaddressinput/address_validator.h
@@ -23,16 +23,12 @@
 #include <libaddressinput/address_problem.h>
 #include <libaddressinput/callback.h>
 #include <libaddressinput/util/basictypes.h>
-#include <libaddressinput/util/scoped_ptr.h>
 
 #include <map>
-#include <string>
 
 namespace i18n {
 namespace addressinput {
 
-class Downloader;
-class Storage;
 class Supplier;
 struct AddressData;
 
@@ -72,11 +68,6 @@ class AddressValidator {
  public:
   typedef i18n::addressinput::Callback<AddressData, FieldProblemMap> Callback;
 
-  // DEPRECATED! TODO: Delete when libaddressinput users have been updated.
-  AddressValidator(const std::string& validation_data_url,
-                   const Downloader* downloader,
-                   Storage* storage);
-
   // Does not take ownership of |supplier|.
   AddressValidator(Supplier* supplier);
 
@@ -108,9 +99,6 @@ class AddressValidator {
                 const Callback& validated) const;
 
  private:
-  // AddressValidator objects can either use an already existing Supplier
-  // object, or create its own Supplier object to use.
-  const scoped_ptr<Supplier> own_supplier_;
   Supplier* const supplier_;
 
   DISALLOW_COPY_AND_ASSIGN(AddressValidator);
diff --git a/cpp/src/address_validator.cc b/cpp/src/address_validator.cc
index 5c333e5..b3e4aae 100644
--- a/cpp/src/address_validator.cc
+++ b/cpp/src/address_validator.cc
@@ -14,31 +14,12 @@
 
 #include <libaddressinput/address_validator.h>
 
-#include <libaddressinput/address_field.h>
-#include <libaddressinput/ondemand_supplier.h>
-#include <libaddressinput/supplier.h>
-#include <libaddressinput/util/scoped_ptr.h>
-
-#include <string>
-
-#include "retriever.h"
 #include "validation_task.h"
 
 namespace i18n {
 namespace addressinput {
 
-AddressValidator::AddressValidator(const std::string& validation_data_url,
-                                   const Downloader* downloader,
-                                   Storage* storage)
-    : own_supplier_(
-          new OndemandSupplier(validation_data_url, downloader, storage)),
-      supplier_(own_supplier_.get()) {
-  assert(supplier_ != NULL);
-}
-
-AddressValidator::AddressValidator(Supplier* supplier)
-    : own_supplier_(),
-      supplier_(supplier) {
+AddressValidator::AddressValidator(Supplier* supplier) : supplier_(supplier) {
   assert(supplier_ != NULL);
 }