[rAc - libaddressinput] slay another helper class

third_party/libaddressinput/chromium/cpp/src/validating_storage.cc

Index: third_party/libaddressinput/chromium/cpp/src/validating_storage.cc
diff --git a/third_party/libaddressinput/chromium/cpp/src/validating_storage.cc b/third_party/libaddressinput/chromium/cpp/src/validating_storage.cc
deleted file mode 100644
index 967de49da057733915b67dd70fa8f30772fae2fa..0000000000000000000000000000000000000000
--- a/third_party/libaddressinput/chromium/cpp/src/validating_storage.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (C) 2013 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-// ValidatingStorage saves data with checksum and timestamp using
-// ValidatingUtil.
-
-#include "validating_storage.h"
-
-#include <libaddressinput/callback.h>
-#include <libaddressinput/storage.h>
-#include <libaddressinput/util/basictypes.h>
-#include <libaddressinput/util/scoped_ptr.h>
-
-#include <cassert>
-#include <cstddef>
-#include <ctime>
-#include <string>
-
-#include "validating_util.h"
-
-namespace i18n {
-namespace addressinput {
-
-namespace {
-
-class Helper {
- public:
-  Helper(const std::string& key,
-         scoped_ptr<Storage::Callback> data_ready,
-         const Storage& wrapped_storage)
-      : data_ready_(data_ready.Pass()) {
-    wrapped_storage.Get(key, BuildCallback(this, &Helper::OnWrappedDataReady));
-  }
-
- private:
-  ~Helper() {}
-
-  void OnWrappedDataReady(bool success,
-                          const std::string& key,
-                          const std::string& wrapped_data) {
-    std::string data(wrapped_data);
-    if (!success ||
-        !ValidatingUtil::UnwrapTimestamp(&data, time(NULL)) ||
-        !ValidatingUtil::UnwrapChecksum(&data)) {
-      // TODO(estade): Pretty unsafe. |this| owns |data_ready_|, but
-      // |data_ready_->instance_| might be stale.
-      (*data_ready_)(false, key, std::string());
-    } else {
-      (*data_ready_)(true, key, data);
-    }
-    // TODO(estade): |this| will leak if the callback is never run. Make this
-    // safer.
-    delete this;
-  }
-
-  scoped_ptr<Storage::Callback> data_ready_;
-
-  DISALLOW_COPY_AND_ASSIGN(Helper);
-};
-
-}  // namespace
-
-ValidatingStorage::ValidatingStorage(scoped_ptr<Storage> storage)
-    : wrapped_storage_(storage.Pass()) {
-  assert(wrapped_storage_ != NULL);
-}
-
-ValidatingStorage::~ValidatingStorage() {}
-
-void ValidatingStorage::Put(const std::string& key, const std::string& data) {
-  wrapped_storage_->Put(key, ValidatingUtil::Wrap(data, time(NULL)));
-}
-
-void ValidatingStorage::Get(const std::string& key,
-                            scoped_ptr<Callback> data_ready) const {
-  new Helper(key, data_ready.Pass(), *wrapped_storage_);
-}
-
-}  // namespace addressinput
-}  // namespace i18n