Roll ICU and convert include style to standard Chromium style,

chrome/browser/chromeos/login/wizard_controller_browsertest.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 "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/reset_screen.h"
 #include "chrome/browser/chromeos/login/test_login_utils.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/icu/public/common/unicode/locid.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "unicode/locid.h"
 
 namespace chromeos {
 
 namespace {
 const char kUsername[] = "test_user@managedchrome.com";
 const char kPassword[] = "test_password";
 }  // namespace
 
 using ::testing::_;
 
@@ skipping 271 matching lines @@
   OnExit(ScreenObserver::RESET_CANCELED);
   EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
 }
 
 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
 
 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 14,
                add_tests_for_new_control_flow_you_just_introduced);
 
 }  // namespace chromeos