diff options
39 files changed, 84 insertions, 51 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc index 445fa90..09eea45 100644 --- a/app/sql/connection.cc +++ b/app/sql/connection.cc @@ -9,6 +9,7 @@ #include "app/sql/statement.h" #include "base/file_path.h" #include "base/logging.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "third_party/sqlite/sqlite3.h" diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc index 6b28de5..a529a84 100644 --- a/base/i18n/number_formatting.cc +++ b/base/i18n/number_formatting.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "unicode/numfmt.h" diff --git a/base/json/json_reader.cc b/base/json/json_reader.cc index 82bc7d4..b286995 100644 --- a/base/json/json_reader.cc +++ b/base/json/json_reader.cc @@ -7,6 +7,7 @@ #include "base/float_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -189,8 +190,8 @@ Value* JSONReader::JsonToValue(const std::string& json, bool check_root, std::string JSONReader::FormatErrorMessage(int line, int column, const std::string& description) { if (line || column) { - return StringPrintf("Line: %i, column: %i, %s", - line, column, description.c_str()); + return base::StringPrintf( + "Line: %i, column: %i, %s", line, column, description.c_str()); } return description; } diff --git a/base/json/json_writer.cc b/base/json/json_writer.cc index fa8f239..6531772 100644 --- a/base/json/json_writer.cc +++ b/base/json/json_writer.cc @@ -6,7 +6,7 @@ #include "base/json/string_escape.h" #include "base/logging.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/values.h" #include "base/utf_string_conversions.h" @@ -71,7 +71,7 @@ void JSONWriter::BuildJSONString(const Value* const node, int value; bool result = node->GetAsInteger(&value); DCHECK(result); - StringAppendF(json_string_, "%d", value); + base::StringAppendF(json_string_, "%d", value); break; } diff --git a/base/json/string_escape.cc b/base/json/string_escape.cc index 0b12439..b4415b8 100644 --- a/base/json/string_escape.cc +++ b/base/json/string_escape.cc @@ -6,6 +6,7 @@ #include <string> +#include "base/stringprintf.h" #include "base/string_util.h" namespace base { @@ -63,7 +64,7 @@ void JsonDoubleQuoteT(const STR& str, // 2. Technically, we could also pass through c > 126 as UTF8, but this // is also optional. It would also be a pain to implement here. unsigned int as_uint = static_cast<unsigned int>(c); - StringAppendF(dst, "\\u%04X", as_uint); + base::StringAppendF(dst, "\\u%04X", as_uint); } else { unsigned char ascii = static_cast<unsigned char>(*it); dst->push_back(ascii); diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 4cd27f6..fea4347 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -17,6 +17,7 @@ #include "base/file_util.h" #include "base/logging.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_tokenizer.h" @@ -75,7 +76,7 @@ int GetProcessCPU(pid_t pid) { base::ThreadRestrictions::ScopedAllowIO allow_io; // Use /proc/<pid>/task to find all threads and parse their /stat file. - FilePath path = FilePath(StringPrintf("/proc/%d/task/", pid)); + FilePath path = FilePath(base::StringPrintf("/proc/%d/task/", pid)); DIR* dir = opendir(path.value().c_str()); if (!dir) { diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h index d319fbe..caaeba3 100644 --- a/chrome/browser/browser_about_handler.h +++ b/chrome/browser/browser_about_handler.h @@ -13,7 +13,7 @@ #include <vector> #include "base/process.h" -#include "base/string_util.h" +#include "base/stringprintf.h" template <typename T> struct DefaultSingletonTraits; class GURL; @@ -60,7 +60,8 @@ class AboutTcmallocOutputs { // the output for a canonical renderer header string that // incorporates the pid. void RendererCallback(base::ProcessId pid, const std::string& output) { - SetOutput(StringPrintf("Renderer PID %d", static_cast<int>(pid)), output); + SetOutput( + base::StringPrintf("Renderer PID %d", static_cast<int>(pid)), output); } private: diff --git a/chrome/browser/debugger/debugger_remote_service.cc b/chrome/browser/debugger/debugger_remote_service.cc index 6c21e2e..5847191 100644 --- a/chrome/browser/debugger/debugger_remote_service.cc +++ b/chrome/browser/debugger/debugger_remote_service.cc @@ -9,6 +9,7 @@ #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 6e55da0..90e95e0 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -10,6 +10,7 @@ #include "base/json/json_writer.h" #include "base/logging.h" #include "base/message_loop_proxy.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" @@ -152,11 +153,11 @@ void DevToolsHttpProtocolHandler::OnHttpRequest( net::URLRequest* request; - if (info.path.find("/devtools/") == 0) + if (info.path.find("/devtools/") == 0) { request = new net::URLRequest(GURL("chrome-devtools:/" + info.path), this); - else if (info.path.find("/thumb/") == 0) + } else if (info.path.find("/thumb/") == 0) { request = new net::URLRequest(GURL("chrome:/" + info.path), this); - else { + } else { server_->Send404(connection_id); return; } diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index f824768..1d7e5a9f 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "base/json/json_writer.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/sync/engine/syncer_proto_util.cc b/chrome/browser/sync/engine/syncer_proto_util.cc index a3a6177..e96af94 100644 --- a/chrome/browser/sync/engine/syncer_proto_util.cc +++ b/chrome/browser/sync/engine/syncer_proto_util.cc @@ -5,7 +5,7 @@ #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "base/format_macros.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_types.h" @@ -342,19 +342,20 @@ const std::string& SyncerProtoUtil::NameFromCommitEntryResponse( std::string SyncerProtoUtil::SyncEntityDebugString( const sync_pb::SyncEntity& entry) { - return StringPrintf("id: %s, parent_id: %s, " - "version: %"PRId64"d, " - "mtime: %" PRId64"d (client: %" PRId64"d), " - "ctime: %" PRId64"d (client: %" PRId64"d), " - "name: %s, sync_timestamp: %" PRId64"d, " - "%s ", - entry.id_string().c_str(), - entry.parent_id_string().c_str(), - entry.version(), - entry.mtime(), ServerTimeToClientTime(entry.mtime()), - entry.ctime(), ServerTimeToClientTime(entry.ctime()), - entry.name().c_str(), entry.sync_timestamp(), - entry.deleted() ? "deleted, ":""); + return base::StringPrintf( + "id: %s, parent_id: %s, " + "version: %"PRId64"d, " + "mtime: %" PRId64"d (client: %" PRId64"d), " + "ctime: %" PRId64"d (client: %" PRId64"d), " + "name: %s, sync_timestamp: %" PRId64"d, " + "%s ", + entry.id_string().c_str(), + entry.parent_id_string().c_str(), + entry.version(), + entry.mtime(), ServerTimeToClientTime(entry.mtime()), + entry.ctime(), ServerTimeToClientTime(entry.ctime()), + entry.name().c_str(), entry.sync_timestamp(), + entry.deleted() ? "deleted, ":""); } namespace { diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index 7983c73..dce65ba0 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -17,8 +17,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/stl_util-inl.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "base/string_util.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/protocol/service_constants.h" #include "chrome/browser/sync/protocol/sync.pb.h" @@ -740,9 +740,9 @@ bool DirectoryBackingStore::MigrateToSpecifics( void (*handler_function)(SQLStatement* old_value_query, int old_value_column, sync_pb::EntitySpecifics* mutable_new_value)) { - std::string query_sql = StringPrintf("SELECT metahandle, %s, %s FROM metas", - specifics_column, old_columns); - std::string update_sql = StringPrintf( + std::string query_sql = base::StringPrintf( + "SELECT metahandle, %s, %s FROM metas", specifics_column, old_columns); + std::string update_sql = base::StringPrintf( "UPDATE metas SET %s = ? WHERE metahandle = ?", specifics_column); SQLStatement query; query.prepare(load_dbhandle_, query_sql.c_str()); @@ -769,8 +769,8 @@ bool DirectoryBackingStore::MigrateToSpecifics( bool DirectoryBackingStore::AddColumn(const ColumnSpec* column) { SQLStatement add_column; - std::string sql = StringPrintf("ALTER TABLE metas ADD COLUMN %s %s", - column->name, column->spec); + std::string sql = base::StringPrintf( + "ALTER TABLE metas ADD COLUMN %s %s", column->name, column->spec); add_column.prepare(load_dbhandle_, sql.c_str()); return add_column.step() == SQLITE_DONE; } diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index d378d85..1c8b9fc 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -12,6 +12,7 @@ #include "base/memory/scoped_temp_dir.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 14b9178..dff7938 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -12,7 +12,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/linked_ptr.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/common/extensions/extension_message_bundle.cc b/chrome/common/extensions/extension_message_bundle.cc index 26e9c97..a3740a9 100644 --- a/chrome/common/extensions/extension_message_bundle.cc +++ b/chrome/common/extensions/extension_message_bundle.cc @@ -13,7 +13,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util-inl.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc index 664c73d..2448c12 100644 --- a/chrome/common/net/gaia/gaia_auth_fetcher.cc +++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc @@ -8,6 +8,7 @@ #include <utility> #include <vector> +#include "base/stringprintf.h" #include "base/string_split.h" #include "base/string_util.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index 2cbcc37..3681e40 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -15,6 +15,7 @@ #include "base/process.h" #include "base/shared_memory.h" #include "base/string16.h" +#include "base/stringprintf.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/common/common_param_traits.h" diff --git a/chrome/renderer/extensions/bindings_utils.cc b/chrome/renderer/extensions/bindings_utils.cc index d563319..89fa70b 100644 --- a/chrome/renderer/extensions/bindings_utils.cc +++ b/chrome/renderer/extensions/bindings_utils.cc @@ -5,8 +5,8 @@ #include "chrome/renderer/extensions/bindings_utils.h" #include "base/lazy_instance.h" +#include "base/stringprintf.h" #include "base/string_split.h" -#include "base/string_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/extension_dispatcher.h" @@ -71,7 +71,7 @@ bool ExtensionBase::CheckPermissionForCurrentContext( static const char kMessage[] = "You do not have permission to use '%s'. Be sure to declare" " in your manifest what permissions you need."; - std::string error_msg = StringPrintf(kMessage, function_name.c_str()); + std::string error_msg = base::StringPrintf(kMessage, function_name.c_str()); v8::ThrowException(v8::Exception::Error(v8::String::New(error_msg.c_str()))); return false; diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 48c0fb8..3757fc8c 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -180,8 +180,9 @@ void UserScriptSlave::InsertInitExtensionCode( DCHECK(sources); bool incognito = ChromeRenderProcessObserver::is_incognito_process(); sources->insert(sources->begin(), WebScriptSource(WebString::fromUTF8( - StringPrintf(kInitExtension, extension_id.c_str(), - incognito ? "true" : "false")))); + base::StringPrintf(kInitExtension, + extension_id.c_str(), + incognito ? "true" : "false")))); } void UserScriptSlave::InjectScripts(WebFrame* frame, diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc index 88a1091..bf9a946 100644 --- a/chrome/renderer/security_filter_peer.cc +++ b/chrome/renderer/security_filter_peer.cc @@ -4,6 +4,7 @@ #include "chrome/renderer/security_filter_peer.h" +#include "base/stringprintf.h" #include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/content/browser/geolocation/libgps_wrapper_linux.cc b/content/browser/geolocation/libgps_wrapper_linux.cc index d09ea01..e1d47880 100644 --- a/content/browser/geolocation/libgps_wrapper_linux.cc +++ b/content/browser/geolocation/libgps_wrapper_linux.cc @@ -8,7 +8,7 @@ #include <errno.h> #include "base/logging.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "content/common/geoposition.h" namespace { @@ -108,7 +108,7 @@ bool LibGps::Poll() { while (DataWaiting()) { int error = library().poll(); if (error) { - last_error_ = StringPrintf("poll() returned %d", error); + last_error_ = base::StringPrintf("poll() returned %d", error); Stop(); return false; } diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc index 5396095..7f92ece 100644 --- a/content/browser/geolocation/wifi_data_provider_common.cc +++ b/content/browser/geolocation/wifi_data_provider_common.cc @@ -4,6 +4,7 @@ #include "content/browser/geolocation/wifi_data_provider_common.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" string16 MacAddressAsString16(const uint8 mac_as_int[6]) { @@ -11,9 +12,13 @@ string16 MacAddressAsString16(const uint8 mac_as_int[6]) { // Format is XX-XX-XX-XX-XX-XX. static const wchar_t* const kMacFormatString = L"%02x-%02x-%02x-%02x-%02x-%02x"; - return WideToUTF16(StringPrintf(kMacFormatString, - mac_as_int[0], mac_as_int[1], mac_as_int[2], - mac_as_int[3], mac_as_int[4], mac_as_int[5])); + return WideToUTF16(base::StringPrintf(kMacFormatString, + mac_as_int[0], + mac_as_int[1], + mac_as_int[2], + mac_as_int[3], + mac_as_int[4], + mac_as_int[5])); } WifiDataProviderCommon::WifiDataProviderCommon() diff --git a/content/common/child_process_info.cc b/content/common/child_process_info.cc index 109a4f4..fad7e03 100644 --- a/content/common/child_process_info.cc +++ b/content/common/child_process_info.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "base/rand_util.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" ChildProcessInfo::ChildProcessInfo(ProcessType type, int id) : diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 57b7808..91c3f85 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -8,6 +8,7 @@ #include "base/process_util.h" #include "base/rand_util.h" +#include "base/stringprintf.h" #include "content/common/child_process.h" #include "content/ppapi_plugin/broker_process_dispatcher.h" #include "content/ppapi_plugin/plugin_process_dispatcher.h" diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index 1aff129..5bf5874 100644 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -14,6 +14,7 @@ #include "base/format_macros.h" #include "base/string16.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/tuple.h" #include "ipc/ipc_param_traits.h" diff --git a/media/filters/ffmpeg_glue.cc b/media/filters/ffmpeg_glue.cc index 236b3d6..23f0a36 100644 --- a/media/filters/ffmpeg_glue.cc +++ b/media/filters/ffmpeg_glue.cc @@ -4,7 +4,8 @@ #include "media/filters/ffmpeg_glue.h" -#include "base/string_util.h" +#include "base/logging.h" +#include "base/stringprintf.h" #include "media/base/filters.h" #include "media/ffmpeg/ffmpeg_common.h" @@ -181,7 +182,7 @@ std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) { // Use the FFmpegURLProtocol's memory address to generate the unique string. // This also has the nice property that adding the same FFmpegURLProtocol // reference will not generate duplicate entries. - return StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol)); + return base::StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol)); } } // namespace media diff --git a/net/http/http_proxy_utils.cc b/net/http/http_proxy_utils.cc index 3e4fb8b..e93c8ee 100644 --- a/net/http/http_proxy_utils.cc +++ b/net/http/http_proxy_utils.cc @@ -4,7 +4,7 @@ #include "net/http/http_proxy_utils.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc index 9d523c1..9cd2f9f 100644 --- a/net/http/http_request_headers.cc +++ b/net/http/http_request_headers.cc @@ -5,6 +5,7 @@ #include "net/http/http_request_headers.h" #include "base/logging.h" +#include "base/stringprintf.h" #include "base/string_split.h" #include "base/string_util.h" #include "net/http/http_util.h" diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 0649bce..5bf6671 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc @@ -6,6 +6,7 @@ #include "base/compiler_specific.h" #include "base/metrics/histogram.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "net/base/address_list.h" #include "net/base/auth.h" diff --git a/net/http/http_util.cc b/net/http/http_util.cc index 95a57d2e..b634cbf 100644 --- a/net/http/http_util.cc +++ b/net/http/http_util.cc @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/logging.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" #include "base/string_util.h" diff --git a/net/proxy/proxy_bypass_rules.cc b/net/proxy/proxy_bypass_rules.cc index dde3d8f..df5109e 100644 --- a/net/proxy/proxy_bypass_rules.cc +++ b/net/proxy/proxy_bypass_rules.cc @@ -5,6 +5,7 @@ #include "net/proxy/proxy_bypass_rules.h" #include "base/stl_util-inl.h" +#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" #include "base/string_util.h" diff --git a/net/url_request/view_cache_helper.cc b/net/url_request/view_cache_helper.cc index 8a3eaed..cd722e4 100644 --- a/net/url_request/view_cache_helper.cc +++ b/net/url_request/view_cache_helper.cc @@ -4,7 +4,7 @@ #include "net/url_request/view_cache_helper.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "net/base/escape.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 5a85c1a..1f1d2af 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -14,6 +14,7 @@ #include "base/i18n/file_util_icu.h" #include "base/lazy_instance.h" #include "base/message_loop.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/i18n/time_formatting.h" diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index ae342b3..30b3010 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -8,7 +8,7 @@ #include <vector> #include "base/message_loop.h" -#include "base/string_util.h" +#include "base/stringprintf.h" #include "base/task.h" #include "base/threading/thread.h" // TODO(sergeyu): We should not depend on renderer here. Instead P2P @@ -112,8 +112,9 @@ bool ChromotingInstance::Init(uint32_t argc, void ChromotingInstance::Connect(const ClientConfig& config) { DCHECK(CurrentlyOnPluginThread()); - LogDebugInfo(StringPrintf("Connecting to %s as %s", config.host_jid.c_str(), - config.username.c_str()).c_str()); + LogDebugInfo(base::StringPrintf("Connecting to %s as %s", + config.host_jid.c_str(), + config.username.c_str()).c_str()); client_.reset(new ChromotingClient(config, &context_, host_connection_.get(), diff --git a/ui/gfx/insets.cc b/ui/gfx/insets.cc index 8262ebf..3a33965 100644 --- a/ui/gfx/insets.cc +++ b/ui/gfx/insets.cc @@ -4,7 +4,7 @@ #include "ui/gfx/insets.h" -#include "base/string_util.h" +#include "base/stringprintf.h" namespace gfx { diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc index 4a07d34..2f61ce9 100644 --- a/webkit/appcache/view_appcache_internals_job.cc +++ b/webkit/appcache/view_appcache_internals_job.cc @@ -9,6 +9,7 @@ #include "base/base64.h" #include "base/logging.h" #include "base/format_macros.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc index 6ff830a..8e980ec 100644 --- a/webkit/blob/view_blob_internals_job.cc +++ b/webkit/blob/view_blob_internals_job.cc @@ -10,6 +10,7 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "net/base/escape.h" diff --git a/webkit/glue/media/buffered_resource_loader.cc b/webkit/glue/media/buffered_resource_loader.cc index 8d7f1dd..883f8a5 100644 --- a/webkit/glue/media/buffered_resource_loader.cc +++ b/webkit/glue/media/buffered_resource_loader.cc @@ -5,6 +5,7 @@ #include "webkit/glue/media/buffered_resource_loader.h" #include "base/format_macros.h" +#include "base/stringprintf.h" #include "base/string_util.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/webkit/plugins/npapi/plugin_list_posix.cc b/webkit/plugins/npapi/plugin_list_posix.cc index e193c4d..9d35898 100644 --- a/webkit/plugins/npapi/plugin_list_posix.cc +++ b/webkit/plugins/npapi/plugin_list_posix.cc @@ -7,6 +7,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/sha1.h" +#include "base/stringprintf.h" #include "base/string_split.h" #include "base/string_util.h" #include "build/build_config.h" |