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

third_party/libaddressinput/chromium/cpp/test/countryinfo_example_addresses_test.cc

 // Copyright (C) 2014 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 14 matching lines @@
 #include <algorithm>
 #include <sstream>
 #include <string>
 
 #include <gtest/gtest.h>
 
 #include "address_validator_test.h"
 #include "fake_downloader.h"
 #include "fake_storage.h"
 #include "util/json.h"
-#include "util/string_util.h"
+#include "util/string_split.h"
 
 namespace i18n {
 namespace addressinput {
 
 namespace {
 class AddressProblemEqualsString
     : public std::binary_function<AddressProblem, std::string, bool> {
  public:
   bool operator()(const AddressProblem& ap, const std::string& ep) const {
     std::ostringstream oss;
@@ skipping 155 matching lines @@
   SplitString(countries_str, '~', &countries);
 
   for (std::vector<std::string>::const_iterator it = countries.begin();
        it != countries.end(); ++it) {
     TestCountry(*it);
   }
 }
 
 }  // addressinput
 }  // i18n