Retry r259150: Determine language code and type of format for address.

third_party/libaddressinput/chromium/cpp/test/util/string_util_test.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // The original source code is from:
 // http://src.chromium.org/viewvc/chrome/trunk/src/base/strings/string_split_unittest.cc?revision=216633
 
-#include "util/string_split.h"
+#include "util/string_util.h"
 
 #include <string>
 #include <vector>
 
 #include <gtest/gtest.h>
 
 namespace {
 
 using i18n::addressinput::SplitString;
 
@@ skipping 61 matching lines @@
   EXPECT_EQ(r[2], "a");
   EXPECT_EQ(r[3], " ");
 
   SplitString("\ta\t\nb\tcc", '\n', &r);
   ASSERT_EQ(2U, r.size());
   EXPECT_EQ(r[0], "\ta\t");
   EXPECT_EQ(r[1], "b\tcc");
 }
 
 }  // namespace