Skip to content

Commit

Permalink
Use a direct include of utf_string_conversions.h in chrome_frame/, ch…
Browse files Browse the repository at this point in the history 
…romeos/, cloud_print/, components/, courgette/, device/, extensions/.

BUG=none
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16614002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204961 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
avi@chromium.org committed Jun 7, 2013
1 parent f72c762 commit d2d79d5
Show file tree
Hide file tree
Showing 127 changed files with 130 additions and 130 deletions.
2 changes: 1 addition & 1 deletion chrome_frame/chrome_active_document.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_variant.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/app/chrome_dll_resource.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/chrome_frame_activex.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_split.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_variant.h"
#include "chrome/common/automation_messages.h"
Expand Down
4 changes: 2 additions & 2 deletions chrome_frame/chrome_frame_activex_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
#include "base/metrics/histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_variant.h"
#include "grit/chrome_frame_resources.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/common/url_constants.h"
#include "chrome_frame/chrome_frame_plugin.h"
Expand All @@ -35,6 +34,7 @@
#include "chrome_frame/urlmon_url_request.h"
#include "chrome_frame/urlmon_url_request_private.h"
#include "chrome_frame/utils.h"
#include "grit/chrome_frame_resources.h"
#include "grit/generated_resources.h"
#include "net/cookies/cookie_monster.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/chrome_frame_automation.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/synchronization/waitable_event.h"
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
#include "chrome/app/client_util.h"
#include "chrome/common/automation_messages.h"
#include "chrome/common/chrome_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/chrome_tab.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "base/string_util.h"
#include "base/strings/string_piece.h"
#include "base/strings/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/com_message_event.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"

ComMessageEvent::ComMessageEvent() {
}
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/crash_reporting/nt_loader_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
#include "chrome_frame/crash_reporting/crash_dll.h"
#include "gtest/gtest.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/crash_reporting/vectored_handler_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "base/environment.h"
#include "base/memory/scoped_ptr.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome_frame/crash_reporting/crash_dll.h"
#include "chrome_frame/crash_reporting/nt_loader.h"
#include "chrome_frame/crash_reporting/vectored_handler-impl.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/dll_redirector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/path_service.h"
#include "base/shared_memory.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/version.h"
#include "base/win/windows_version.h"
#include "chrome_frame/utils.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/find_dialog.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <richedit.h>

#include "base/guid.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome_frame/chrome_frame_automation.h"

const int kMaxFindChars = 1024;
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/http_negotiate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/exception_barrier.h"
#include "chrome_frame/html_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/metrics_service.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_comptr.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/metrics/metrics_log_base.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/navigation_constraints.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "chrome_frame/navigation_constraints.h"

#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/url_constants.h"
#include "chrome_frame/utils.h"
#include "extensions/common/constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/policy_settings.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "base/logging.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "chrome_frame/utils.h"
#include "policy/policy_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/protocol_sink_wrap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/bind_context_info.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/simple_resource_loader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/memory/singleton.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/i18n.h"
#include "base/win/windows_version.h"
#include "chrome_frame/policy_settings.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/chrome_frame_automation_mock.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_process_killer_win.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_switches.h"
#include "chrome_frame/chrome_frame_automation.h"
#include "chrome_frame/chrome_frame_plugin.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/chrome_frame_test_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/chrome_frame_ui_test_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "chrome/common/chrome_paths.h"
#include "chrome_frame/test/win_event_receiver.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/dll_redirector_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "chrome_frame/dll_redirector.h"

#include "base/shared_memory.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/version.h"
#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/html_util_unittests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/net_util.h"

#include "chrome/browser/automation/url_request_automation_job.h"
Expand Down
6 changes: 3 additions & 3 deletions chrome_frame/test/http_negotiate_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

#include "base/string16.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "chrome_frame/http_negotiate.h"
#include "chrome_frame/html_utils.h"
#include "chrome_frame/http_negotiate.h"
#include "chrome_frame/registry_list_preferences_holder.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/utils.h"
#include "gtest/gtest.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"

class HttpNegotiateTest : public testing::Test {
protected:
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/ie_event_sink.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_handle.h"
#include "base/win/scoped_variant.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/mock_ie_event_sink_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <sstream>

#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_variant.h"
#include "chrome_frame/test/mock_ie_event_sink_actions.h"

Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/mock_ie_event_sink_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "base/files/file_path.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/object_watcher.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test/chrome_frame_ui_test_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/perf/chrome_frame_perftest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include "base/process_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
#include "base/threading/platform_thread.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "base/win/event_trace_consumer.h"
#include "base/win/event_trace_controller.h"
#include "base/win/registry.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/policy_settings_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "chrome_frame/policy_settings.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/reliability/page_load_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
#include "base/prefs/pref_value_store.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/prefs/pref_service_mock_builder.h"
#include "chrome/common/automation_messages.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_scrubber.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "base/logging.h"
#include "base/process_util.h"
#include "base/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_process_killer_win.h"
#include "base/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
#include "chrome/common/chrome_constants.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "net/base/winsock_init.h"
#include "net/http/http_util.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_with_web_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
#include "base/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/installer/util/helper.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/test_with_web_server.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
#include "chrome_frame/chrome_tab.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/ui_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <string>

#include "base/file_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_variant.h"
#include "base/win/windows_version.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test/util_unittests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "base/file_version_info_win.h"
#include "base/files/file_path.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "chrome_frame/navigation_constraints.h"
#include "chrome_frame/registry_list_preferences_holder.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/test_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/urlmon_bind_status_callback.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/platform_thread.h"
#include "base/utf_string_conversions.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/chrome_tab.h"
#include "chrome_frame/exception_barrier.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/urlmon_moniker.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/chrome_active_document.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/urlmon_url_request.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
#include "base/message_loop.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/platform_thread.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/automation_messages.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/chrome_frame_activex_base.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome_frame/utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include "base/stringprintf.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_local.h"
#include "base/utf_string_conversions.h"
#include "base/win/registry.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
Expand Down
Loading

0 comments on commit d2d79d5

Please sign in to comment.