Consolidate most of net/'s icu_string_conversions.h dependencies.

net/base/escape_unittest.cc

 // Copyright (c) 2012 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.
 
 #include <algorithm>
 #include <string>
 
 #include "net/base/escape.h"
 
 #include "base/basictypes.h"
-#include "base/i18n/icu_string_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace {
 
 struct EscapeCase {
   const char* input;
@@ skipping 428 matching lines @@
   };
   for (size_t i = 0; i < arraysize(tests); ++i) {
     base::string16 result = UnescapeForHTML(base::ASCIIToUTF16(tests[i].input));
     EXPECT_EQ(base::ASCIIToUTF16(tests[i].expected_output), result);
   }
 }
 
 
 }  // namespace
 }  // namespace net