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

third_party/libaddressinput/chromium/cpp/test/retriever_test.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 <cstddef>
 #include <ctime>
 #include <string>
 
 #include <gtest/gtest.h>
 
 #include "fake_downloader.h"
 #include "fake_storage.h"
 #include "region_data_constants.h"
-#include "util/string_util.h"
+#include "time_to_string.h"
 
 namespace i18n {
 namespace addressinput {
 
 namespace {
 
 const char kKey[] = "data/CA";
 
 // Empty data that the downloader can return.
 const char kEmptyData[] = "{}";
@@ skipping 284 matching lines @@
 
 TEST_F(RetrieverTest, NullCallbackNoCrash) {
   ASSERT_NO_FATAL_FAILURE(
       retriever_->Retrieve(kKey, scoped_ptr<Retriever::Callback>()));
   ASSERT_NO_FATAL_FAILURE(
       retriever_->Retrieve(kKey, scoped_ptr<Retriever::Callback>()));
 }
 
 }  // namespace addressinput
 }  // namespace i18n