Skip to content

Commit eaf9253

Browse files
author
avi@chromium.org
committed
Use a direct include of strings headers in remoting/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16181013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205464 0039d316-1c4b-4281-b951-d872f2087c98
1 parent cc26886 commit eaf9253

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+66
-66
lines changed

‎remoting/base/breakpad_win_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/environment.h"
1010
#include "base/logging.h"
1111
#include "base/memory/scoped_ptr.h"
12-
#include "base/stringprintf.h"
12+
#include "base/strings/stringprintf.h"
1313
#include "base/strings/utf_string_conversions.h"
1414
#include "breakpad/src/client/windows/crash_generation/client_info.h"
1515
#include "breakpad/src/client/windows/crash_generation/crash_generation_server.h"

‎remoting/base/capabilities.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <algorithm>
88
#include <vector>
99

10-
#include "base/string_util.h"
10+
#include "base/strings/string_util.h"
1111

1212
namespace remoting {
1313

‎remoting/base/capabilities_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <algorithm>
66
#include <vector>
77

8-
#include "base/string_util.h"
8+
#include "base/strings/string_util.h"
99
#include "remoting/base/capabilities.h"
1010
#include "testing/gtest/include/gtest/gtest.h"
1111

‎remoting/base/util.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <math.h>
88

99
#include "base/logging.h"
10-
#include "base/stringprintf.h"
10+
#include "base/strings/stringprintf.h"
1111
#include "base/time.h"
1212
#include "media/base/video_frame.h"
1313
#include "media/base/yuv_convert.h"

‎remoting/client/plugin/chromoting_instance.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include "base/json/json_writer.h"
1414
#include "base/lazy_instance.h"
1515
#include "base/logging.h"
16-
#include "base/stringprintf.h"
1716
#include "base/strings/string_split.h"
17+
#include "base/strings/stringprintf.h"
1818
#include "base/synchronization/lock.h"
1919
#include "base/synchronization/waitable_event.h"
2020
#include "base/threading/thread.h"

‎remoting/client/plugin/pepper_port_allocator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "remoting/client/plugin/pepper_port_allocator.h"
66

77
#include "base/bind.h"
8-
#include "base/string_number_conversions.h"
8+
#include "base/strings/string_number_conversions.h"
99
#include "net/base/net_util.h"
1010
#include "ppapi/c/pp_errors.h"
1111
#include "ppapi/cpp/completion_callback.h"

‎remoting/client/plugin/pepper_view.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#include <functional>
88

99
#include "base/message_loop.h"
10-
#include "base/string_util.h"
11-
#include "base/time.h"
10+
#include "base/strings/string_util.h"
1211
#include "base/synchronization/waitable_event.h"
12+
#include "base/time.h"
1313
#include "ppapi/cpp/completion_callback.h"
1414
#include "ppapi/cpp/dev/graphics_2d_dev.h"
1515
#include "ppapi/cpp/dev/view_dev.h"

‎remoting/host/chromoting_param_traits.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "remoting/host/chromoting_param_traits.h"
66

7-
#include "base/stringprintf.h"
7+
#include "base/strings/stringprintf.h"
88

99
namespace IPC {
1010

‎remoting/host/clipboard_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "base/bind.h"
1111
#include "base/logging.h"
1212
#include "base/process_util.h"
13-
#include "base/string16.h"
13+
#include "base/strings/string16.h"
1414
#include "base/strings/utf_string_conversions.h"
1515
#include "base/threading/platform_thread.h"
1616
#include "base/win/scoped_hglobal.h"

‎remoting/host/desktop_process.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "base/logging.h"
1414
#include "base/memory/ref_counted.h"
1515
#include "base/message_loop.h"
16-
#include "base/string_util.h"
16+
#include "base/strings/string_util.h"
1717
#include "ipc/ipc_channel_proxy.h"
1818
#include "remoting/base/auto_thread.h"
1919
#include "remoting/base/auto_thread_task_runner.h"

‎remoting/host/desktop_session_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "base/memory/scoped_ptr.h"
1515
#include "base/memory/weak_ptr.h"
1616
#include "base/path_service.h"
17-
#include "base/stringprintf.h"
17+
#include "base/strings/stringprintf.h"
1818
#include "base/strings/utf_string_conversions.h"
1919
#include "base/threading/thread_checker.h"
2020
#include "base/timer.h"

‎remoting/host/disconnect_window_gtk.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "base/compiler_specific.h"
99
#include "base/logging.h"
10-
#include "base/string_util.h"
10+
#include "base/strings/string_util.h"
1111
#include "base/strings/utf_string_conversions.h"
1212
#include "remoting/host/client_session_control.h"
1313
#include "remoting/host/host_window.h"

‎remoting/host/disconnect_window_mac.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <string>
88

99
#include "base/callback.h"
10-
#include "base/string16.h"
10+
#include "base/strings/string16.h"
1111
#include "base/strings/utf_string_conversions.h"
1212

1313
namespace remoting {

‎remoting/host/disconnect_window_mac.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/bind.h"
1010
#include "base/compiler_specific.h"
1111
#include "base/memory/weak_ptr.h"
12-
#include "base/string_util.h"
12+
#include "base/strings/string_util.h"
1313
#include "base/strings/sys_string_conversions.h"
1414
#include "remoting/host/client_session_control.h"
1515
#include "remoting/host/host_window.h"

‎remoting/host/disconnect_window_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "base/compiler_specific.h"
88
#include "base/logging.h"
99
#include "base/process_util.h"
10-
#include "base/string_util.h"
10+
#include "base/strings/string_util.h"
1111
#include "base/strings/utf_string_conversions.h"
1212
#include "base/win/scoped_gdi_object.h"
1313
#include "base/win/scoped_hdc.h"

‎remoting/host/heartbeat_sender.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "base/logging.h"
1111
#include "base/message_loop/message_loop_proxy.h"
1212
#include "base/rand_util.h"
13-
#include "base/string_number_conversions.h"
13+
#include "base/strings/string_number_conversions.h"
1414
#include "base/strings/stringize_macros.h"
1515
#include "base/time.h"
1616
#include "remoting/base/constants.h"

‎remoting/host/heartbeat_sender_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/memory/ref_counted.h"
1010
#include "base/message_loop.h"
1111
#include "base/message_loop/message_loop_proxy.h"
12-
#include "base/string_number_conversions.h"
12+
#include "base/strings/string_number_conversions.h"
1313
#include "remoting/base/constants.h"
1414
#include "remoting/base/rsa_key_pair.h"
1515
#include "remoting/base/test_rsa_key_pair.h"

‎remoting/host/host_change_notification_listener_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/bind.h"
1010
#include "base/memory/ref_counted.h"
1111
#include "base/message_loop.h"
12-
#include "base/string_number_conversions.h"
12+
#include "base/strings/string_number_conversions.h"
1313
#include "remoting/base/constants.h"
1414
#include "remoting/jingle_glue/mock_objects.h"
1515
#include "testing/gmock/include/gmock/gmock.h"

‎remoting/host/host_event_logger_posix.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "base/memory/scoped_ptr.h"
88
#include "base/memory/weak_ptr.h"
9-
#include "base/stringprintf.h"
9+
#include "base/strings/stringprintf.h"
1010
#include "net/base/ip_endpoint.h"
1111
#include "remoting/host/host_status_monitor.h"
1212
#include "remoting/host/host_status_observer.h"

‎remoting/host/host_event_logger_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "base/memory/scoped_ptr.h"
1212
#include "base/memory/weak_ptr.h"
13-
#include "base/string16.h"
13+
#include "base/strings/string16.h"
1414
#include "base/strings/utf_string_conversions.h"
1515
#include "net/base/ip_endpoint.h"
1616
#include "remoting/host/host_status_monitor.h"

‎remoting/host/host_main.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include "base/command_line.h"
1414
#include "base/files/file_path.h"
1515
#include "base/logging.h"
16-
#include "base/stringprintf.h"
1716
#include "base/strings/stringize_macros.h"
17+
#include "base/strings/stringprintf.h"
1818
#include "base/strings/utf_string_conversions.h"
1919
#include "remoting/base/breakpad.h"
2020
#include "remoting/host/host_exit_codes.h"

‎remoting/host/host_port_allocator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "base/bind.h"
88
#include "base/stl_util.h"
9-
#include "base/string_number_conversions.h"
9+
#include "base/strings/string_number_conversions.h"
1010
#include "googleurl/src/gurl.h"
1111
#include "net/http/http_status_code.h"
1212
#include "net/url_request/url_fetcher.h"

‎remoting/host/host_secret.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "base/logging.h"
1010
#include "base/rand_util.h"
11-
#include "base/string_number_conversions.h"
11+
#include "base/strings/string_number_conversions.h"
1212

1313
namespace remoting {
1414

‎remoting/host/ipc_util_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "base/logging.h"
88
#include "base/single_thread_task_runner.h"
9-
#include "base/stringprintf.h"
9+
#include "base/strings/stringprintf.h"
1010
#include "base/strings/utf_string_conversions.h"
1111
#include "base/win/scoped_handle.h"
1212
#include "base/win/win_util.h"

‎remoting/host/local_input_monitor_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "base/location.h"
1010
#include "base/logging.h"
1111
#include "base/single_thread_task_runner.h"
12-
#include "base/stringprintf.h"
12+
#include "base/strings/stringprintf.h"
1313
#include "base/threading/non_thread_safe.h"
1414
#include "remoting/host/client_session_control.h"
1515
#include "remoting/host/win/message_window.h"

‎remoting/host/plugin/host_script_object.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "base/json/json_writer.h"
1010
#include "base/message_loop.h"
1111
#include "base/message_loop/message_loop_proxy.h"
12-
#include "base/string_util.h"
13-
#include "base/stringprintf.h"
12+
#include "base/strings/string_util.h"
13+
#include "base/strings/stringprintf.h"
1414
#include "base/strings/sys_string_conversions.h"
1515
#include "base/strings/utf_string_conversions.h"
1616
#include "base/threading/platform_thread.h"

‎remoting/host/plugin/host_script_object.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "base/memory/ref_counted.h"
1313
#include "base/memory/scoped_ptr.h"
1414
#include "base/memory/weak_ptr.h"
15-
#include "base/string16.h"
15+
#include "base/strings/string16.h"
1616
#include "base/synchronization/cancellation_flag.h"
1717
#include "base/synchronization/lock.h"
1818
#include "base/synchronization/waitable_event.h"

‎remoting/host/policy_hack/policy_watcher_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "base/compiler_specific.h"
1818
#include "base/memory/scoped_ptr.h"
1919
#include "base/message_loop/message_loop_proxy.h"
20-
#include "base/string16.h"
20+
#include "base/strings/string16.h"
2121
#include "base/strings/utf_string_conversions.h"
2222
#include "base/synchronization/waitable_event.h"
2323
#include "base/values.h"

‎remoting/host/register_support_host_request.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "base/bind.h"
88
#include "base/logging.h"
99
#include "base/message_loop.h"
10-
#include "base/string_number_conversions.h"
10+
#include "base/strings/string_number_conversions.h"
1111
#include "base/time.h"
1212
#include "remoting/base/constants.h"
1313
#include "remoting/host/host_config.h"

‎remoting/host/register_support_host_request_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "base/memory/ref_counted.h"
99
#include "base/message_loop.h"
1010
#include "base/observer_list.h"
11-
#include "base/string_number_conversions.h"
11+
#include "base/strings/string_number_conversions.h"
1212
#include "remoting/base/constants.h"
1313
#include "remoting/base/rsa_key_pair.h"
1414
#include "remoting/base/test_rsa_key_pair.h"

‎remoting/host/remoting_me2me_host.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "base/memory/scoped_ptr.h"
1818
#include "base/message_loop.h"
1919
#include "base/single_thread_task_runner.h"
20-
#include "base/string_number_conversions.h"
21-
#include "base/string_util.h"
20+
#include "base/strings/string_number_conversions.h"
21+
#include "base/strings/string_util.h"
2222
#include "base/strings/utf_string_conversions.h"
2323
#include "base/synchronization/waitable_event.h"
2424
#include "base/threading/thread.h"

‎remoting/host/setup/daemon_controller_linux.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include "base/logging.h"
1818
#include "base/md5.h"
1919
#include "base/process_util.h"
20-
#include "base/string_number_conversions.h"
21-
#include "base/string_util.h"
20+
#include "base/strings/string_number_conversions.h"
2221
#include "base/strings/string_split.h"
22+
#include "base/strings/string_util.h"
2323
#include "base/threading/thread.h"
2424
#include "base/values.h"
2525
#include "net/base/net_util.h"

‎remoting/host/setup/daemon_controller_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "base/json/json_reader.h"
1414
#include "base/json/json_writer.h"
1515
#include "base/logging.h"
16-
#include "base/string16.h"
16+
#include "base/strings/string16.h"
1717
#include "base/strings/utf_string_conversions.h"
1818
#include "base/threading/thread.h"
1919
#include "base/time.h"

‎remoting/host/setup/daemon_installer_win.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "base/bind.h"
1010
#include "base/message_loop.h"
1111
#include "base/process_util.h"
12-
#include "base/string16.h"
13-
#include "base/stringprintf.h"
12+
#include "base/strings/string16.h"
13+
#include "base/strings/stringprintf.h"
1414
#include "base/strings/utf_string_conversions.h"
1515
#include "base/time.h"
1616
#include "base/timer.h"

‎remoting/host/setup/oauth_helper.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "remoting/host/setup/oauth_helper.h"
66

7-
#include "base/stringprintf.h"
7+
#include "base/strings/stringprintf.h"
88
#include "google_apis/google_api_keys.h"
99
#include "googleurl/src/url_parse.h"
1010
#include "net/base/escape.h"

‎remoting/host/setup/start_host.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "base/at_exit.h"
99
#include "base/command_line.h"
1010
#include "base/run_loop.h"
11-
#include "base/stringprintf.h"
11+
#include "base/strings/stringprintf.h"
1212
#include "base/threading/thread.h"
1313
#include "google_apis/gaia/gaia_urls.h"
1414
#include "net/url_request/url_fetcher.h"

‎remoting/host/setup/win/host_configurer_window.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <windows.h>
1111

1212
#include "base/run_loop.h"
13-
#include "base/string16.h"
13+
#include "base/strings/string16.h"
1414
#include "remoting/host/setup/win/load_string_from_resource.h"
1515
#include "remoting/host/setup/win/start_host_window.h"
1616

‎remoting/host/setup/win/start_host_window.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <windows.h>
1010

1111
#include "base/memory/scoped_ptr.h"
12-
#include "base/string16.h"
12+
#include "base/strings/string16.h"
1313
#include "base/strings/utf_string_conversions.h"
1414
#include "google_apis/gaia/gaia_urls.h"
1515
#include "remoting/host/service_urls.h"

‎remoting/host/token_validator_factory_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "base/location.h"
1414
#include "base/logging.h"
1515
#include "base/single_thread_task_runner.h"
16-
#include "base/string_util.h"
16+
#include "base/strings/string_util.h"
1717
#include "base/values.h"
1818
#include "crypto/random.h"
1919
#include "googleurl/src/gurl.h"

‎remoting/host/ui_strings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef REMOTING_HOST_UI_STRINGS_H_
66
#define REMOTING_HOST_UI_STRINGS_H_
77

8-
#include "base/string16.h"
8+
#include "base/strings/string16.h"
99

1010
// This struct contains localized strings to be displayed in host dialogs.
1111
// For the web-app, these are loaded from the appropriate messages.json

‎remoting/host/usage_stats_consent_win.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <string>
99

1010
#include "base/logging.h"
11-
#include "base/stringprintf.h"
11+
#include "base/strings/stringprintf.h"
1212
#include "base/win/registry.h"
1313
#include "remoting/host/win/omaha.h"
1414

‎remoting/host/win/launch_process_with_token.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "base/process_util.h"
1515
#include "base/rand_util.h"
1616
#include "base/scoped_native_library.h"
17-
#include "base/string16.h"
18-
#include "base/stringprintf.h"
17+
#include "base/strings/string16.h"
18+
#include "base/strings/stringprintf.h"
1919
#include "base/strings/utf_string_conversions.h"
2020
#include "base/win/scoped_handle.h"
2121
#include "base/win/scoped_process_information.h"

0 commit comments

Comments
 (0)