Revert of Determine language code and type of format for address.

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

 // 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,
@@ skipping 10 matching lines @@
 #include <libaddressinput/util/scoped_ptr.h>
 
 #include <cassert>
 #include <cstddef>
 #include <cstdlib>
 #include <ctime>
 #include <map>
 #include <string>
 
 #include "fallback_data_store.h"
+#include "time_to_string.h"
 #include "util/md5.h"
 #include "util/stl_util.h"
-#include "util/string_util.h"
 
 namespace i18n {
 namespace addressinput {
 
 namespace {
 
 // The number of seconds after which data is considered stale. The staleness
 // threshold is 30 days:
 //    30 days *
 //    24 hours per day *
@@ skipping 222 matching lines @@
     requests_[key] = callback.release();
     return false;
   }
 
   requests_.erase(iter);
   return true;
 }
 
 }  // namespace addressinput
 }  // namespace i18n