Roll ICU and convert include style to standard Chromium style,

net/base/net_util.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 "net/base/net_util.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 
@@ skipping 50 matching lines @@
 #include "net/android/network_library.h"
 #endif
 #include "net/base/dns_util.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_module.h"
 #if defined(OS_WIN)
 #include "net/base/winsock_init.h"
 #endif
 #include "net/http/http_content_disposition.h"
-#include "unicode/datefmt.h"
-#include "unicode/regex.h"
-#include "unicode/uidna.h"
-#include "unicode/ulocdata.h"
-#include "unicode/uniset.h"
-#include "unicode/uscript.h"
-#include "unicode/uset.h"
+#include "third_party/icu/public/common/unicode/uidna.h"
+#include "third_party/icu/public/common/unicode/uniset.h"
+#include "third_party/icu/public/common/unicode/uscript.h"
+#include "third_party/icu/public/common/unicode/uset.h"
+#include "third_party/icu/public/i18n/unicode/datefmt.h"
+#include "third_party/icu/public/i18n/unicode/regex.h"
+#include "third_party/icu/public/i18n/unicode/ulocdata.h"
 
 using base::Time;
 
 namespace net {
 
 namespace {
 
 // what we prepend to get a file URL
 static const FilePath::CharType kFileURLPrefix[] =
     FILE_PATH_LITERAL("file:///");
@@ skipping 2085 matching lines @@
 
 NetworkInterface::NetworkInterface(const std::string& name,
                                    const IPAddressNumber& address)
     : name(name), address(address) {
 }
 
 NetworkInterface::~NetworkInterface() {
 }
 
 }  // namespace net