c++11 ud suffix fixes for cros dbus files

c++11 ud suffix fixes for cros dbus files

No behavior change.

BUG=263960
R=satorux@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214521

[Nico, 2013-07-29 21:11:28]

This is also an issue in the dbus-1.0 system headers. It seems to be fixed in
the dbus 1.4 system headers. How difficult is it to switch to dbus 1.4?

[Nico, 2013-07-30 18:47:38]

Ping.


On Mon, Jul 29, 2013 at 2:11 PM, <thakis@chromium.org> wrote:

> Reviewers: satorux1,
>
> Message:
> This is also an issue in the dbus-1.0 system headers. It seems to be fixed
> in
> the dbus 1.4 system headers. How difficult is it to switch to dbus 1.4?
>
> Description:
> c++11 ud suffix fixes for cros dbus files
>
> No behavior change.
>
> BUG=263960
>
> Please review this at
https://codereview.chromium.**org/21131003/<https://codereview.chromium.org/2...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>   M chrome/browser/chromeos/**extensions/file_manager/file_**
> browser_private_api.cc
>   M chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
>   M chromeos/audio/audio_device.cc
>   M chromeos/dbus/audio_node.cc
>   M chromeos/network/network_**event_log_unittest.cc
>   M chromeos/network/network_**state_handler.cc
>   M chromeos/network/shill_**property_handler.cc
>   M dbus/message.cc
>
>
> Index: chrome/browser/chromeos/**extensions/file_manager/file_**
> browser_private_api.cc
> diff --git
a/chrome/browser/chromeos/**extensions/file_manager/file_**browser_private_api.cc
> b/chrome/browser/chromeos/**extensions/file_manager/file_**
> browser_private_api.cc
> index 6801f6e408dc62fc70e3c0e05f6dba**a1d9cfba1a..**
> d04052fa9cc8d212b2b1ce5780e139**0ba33cacd6 100644
> --- a/chrome/browser/chromeos/**extensions/file_manager/file_**
> browser_private_api.cc
> +++ b/chrome/browser/chromeos/**extensions/file_manager/file_**
> browser_private_api.cc
> @@ -1661,7 +1661,7 @@ bool GetMountPointsFunction::**RunImpl() {
>
>    log_string += "]";
>
> -  drive::util::Log("%s[%d] succeeded. (results: '%s', %"PRIuS" mount
> points)",
> +  drive::util::Log("%s[%d] succeeded. (results: '%s', %" PRIuS " mount
> points)",
>                     name().c_str(),
>                     request_id(),
>                     log_string.c_str(),
> Index: chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
> diff --git a/chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
> b/chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
> index 498ecf7e708c14eccf758123ad94bf**5bc88cc663..**
> ff0129cedda046c357d8436d5d6906**b1ab7d89c6 100644
> --- a/chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
> +++ b/chrome/browser/ui/webui/**chromeos/drive_internals_ui.cc
> @@ -138,7 +138,7 @@ std::string FormatEntry(const base::FilePath& path,
>
>    const drive::PlatformFileInfoProto& file_info = entry.file_info();
>    StringAppendF(&out, "  file_info\n");
> -  StringAppendF(&out, "    size: %"PRId64"\n", file_info.size());
> +  StringAppendF(&out, "    size: %" PRId64 "\n", file_info.size());
>    StringAppendF(&out, "    is_directory: %d\n", file_info.is_directory());
>    StringAppendF(&out, "    is_symbolic_link: %d\n",
>                  file_info.is_symbolic_link());
> @@ -177,7 +177,7 @@ std::string FormatEntry(const base::FilePath& path,
>      StringAppendF(&out, "  directory_info\n");
>      const drive::DirectorySpecificInfo& directory_specific_info =
>          entry.directory_specific_info(**);
> -    StringAppendF(&out, "    changestamp: %"PRId64"\n",
> +    StringAppendF(&out, "    changestamp: %" PRId64 "\n",
>                    directory_specific_info.**changestamp());
>    }
>
> Index: chromeos/audio/audio_device.cc
> diff --git a/chromeos/audio/audio_device.**cc
> b/chromeos/audio/audio_device.**cc
> index 5e3aeb8fe42cc256648b7b7cb2ec75**92fc14d635..**
> 1448ec453101fc57e5433bf5ee5302**ce4853dfce 100644
> --- a/chromeos/audio/audio_device.**cc
> +++ b/chromeos/audio/audio_device.**cc
> @@ -108,7 +108,7 @@ std::string AudioDevice::ToString() const {
>                        "is_input = %s ",
>                        is_input ? "true" : "false");
>    base::StringAppendF(&result,
> -                      "id = 0x%"PRIx64" ",
> +                      "id = 0x%" PRIx64 " ",
>                        id);
>    base::StringAppendF(&result,
>                        "display_name = %s ",
> Index: chromeos/dbus/audio_node.cc
> diff --git a/chromeos/dbus/audio_node.cc b/chromeos/dbus/audio_node.cc
> index fd3f653c5ee140e1016e6325764911**938e183cc6..**
> 5c337675d21ae10d94c04e05df5b48**8136d0a8ad 100644
> --- a/chromeos/dbus/audio_node.cc
> +++ b/chromeos/dbus/audio_node.cc
> @@ -23,7 +23,7 @@ std::string AudioNode::ToString() const {
>                        "is_input = %s ",
>                        is_input ? "true" : "false");
>    base::StringAppendF(&result,
> -                      "id = 0x%"PRIx64" ",
> +                      "id = 0x%" PRIx64 " ",
>                        id);
>    base::StringAppendF(&result,
>                        "device_name = %s ",
> Index: chromeos/network/network_**event_log_unittest.cc
> diff --git a/chromeos/network/network_**event_log_unittest.cc
> b/chromeos/network/network_**event_log_unittest.cc
> index e98f5a04117f62b83e812b8239a0d3**3418bdbc8f..**
> e98b32c4391a9c78cb30f1687fd692**a180a6060c 100644
> --- a/chromeos/network/network_**event_log_unittest.cc
> +++ b/chromeos/network/network_**event_log_unittest.cc
> @@ -110,7 +110,7 @@ TEST_F(NetworkEventLogTest, TestMaxNetworkEvents) {
>    for (size_t i = 0; i < entries_to_add; ++i) {
>      network_event_log::internal::**AddEntry(
>          "test", 1, LOG_LEVEL_EVENT,
> -        base::StringPrintf("event_%"**PRIuS, i), "");
> +        base::StringPrintf("event_%" PRIuS, i), "");
>    }
>    std::string output = GetLogString(OLDEST_FIRST, 0);
>    size_t output_lines = CountLines(output);
> Index: chromeos/network/network_**state_handler.cc
> diff --git a/chromeos/network/network_**state_handler.cc
> b/chromeos/network/network_**state_handler.cc
> index 4e6a45071ad93be53e956c5f9de9a0**11d32a80e5..**
> 73fcdd87a5809c21e6293251273681**f43fdfa52e 100644
> --- a/chromeos/network/network_**state_handler.cc
> +++ b/chromeos/network/network_**state_handler.cc
> @@ -382,7 +382,7 @@ void
NetworkStateHandler::**UpdateManagedList(**ManagedState::ManagedType
> type,
>                                              const base::ListValue&
> entries) {
>    ManagedStateList* managed_list = GetManagedList(type);
>    NET_LOG_DEBUG(base::**StringPrintf("**UpdateManagedList:%d", type),
> -                base::StringPrintf("%"PRIuS, entries.GetSize()));
> +                base::StringPrintf("%" PRIuS, entries.GetSize()));
>    // Create a map of existing entries. Assumes all entries in
> |managed_list|
>    // are unique.
>    std::map<std::string, ManagedState*> managed_map;
> @@ -552,7 +552,7 @@ void NetworkStateHandler::**ManagedStateListChanged(
>    if (type == ManagedState::MANAGED_TYPE_**NETWORK) {
>      // Notify observers that the list of networks has changed.
>      NET_LOG_EVENT("**NetworkListChanged",
> -                  base::StringPrintf("Size:%"**PRIuS,
> network_list_.size()));
> +                  base::StringPrintf("Size:%" PRIuS,
> network_list_.size()));
>      FOR_EACH_OBSERVER(**NetworkStateHandlerObserver, observers_,
>                        NetworkListChanged());
>      // The list order may have changed, so check if the default network
> changed.
> @@ -560,12 +560,12 @@ void NetworkStateHandler::**ManagedStateListChanged(
>        OnDefaultNetworkChanged();
>    } else if (type == ManagedState::MANAGED_TYPE_**FAVORITE) {
>      NET_LOG_DEBUG("**FavoriteListChanged",
> -                  base::StringPrintf("Size:%"**PRIuS,
> favorite_list_.size()));
> +                  base::StringPrintf("Size:%" PRIuS,
> favorite_list_.size()));
>      FOR_EACH_OBSERVER(**NetworkStateHandlerObserver, observers_,
>                        NetworkListChanged());
>    } else if (type == ManagedState::MANAGED_TYPE_**DEVICE) {
>      NET_LOG_DEBUG("**DeviceListChanged",
> -                  base::StringPrintf("Size:%"**PRIuS,
> device_list_.size()));
> +                  base::StringPrintf("Size:%" PRIuS,
> device_list_.size()));
>      FOR_EACH_OBSERVER(**NetworkStateHandlerObserver, observers_,
>                        DeviceListChanged());
>    } else {
> @@ -669,7 +669,7 @@ void NetworkStateHandler::**NetworkPropertiesUpdated(
>  void NetworkStateHandler::**ScanCompleted(const std::string& type) {
>    size_t num_callbacks = scan_complete_callbacks_.**count(type);
>    NET_LOG_EVENT("ScanCompleted",
> -                base::StringPrintf("%s:%"**PRIuS, type.c_str(),
> num_callbacks));
> +                base::StringPrintf("%s:%" PRIuS, type.c_str(),
> num_callbacks));
>    if (num_callbacks == 0)
>      return;
>    ScanCallbackList& callback_list = scan_complete_callbacks_[type]**;
> Index: chromeos/network/shill_**property_handler.cc
> diff --git a/chromeos/network/shill_**property_handler.cc
> b/chromeos/network/shill_**property_handler.cc
> index bc9c41d2fa93cc2ace7dda96a17a6b**dbc8050e23..**
> 0a7c3cdaf4381eb75a357359cfa4de**48999f7089 100644
> --- a/chromeos/network/shill_**property_handler.cc
> +++ b/chromeos/network/shill_**property_handler.cc
> @@ -419,7 +419,7 @@ void ShillPropertyHandler::**
> UpdateAvailableTechnologies(
>      const base::ListValue& technologies) {
>    available_technologies_.clear(**);
>    NET_LOG_EVENT("**AvailableTechnologiesChanged",
> -                base::StringPrintf("Size: %"PRIuS,
> technologies.GetSize()));
> +                base::StringPrintf("Size: %" PRIuS,
> technologies.GetSize()));
>    for (base::ListValue::const_**iterator iter = technologies.begin();
>         iter != technologies.end(); ++iter) {
>      std::string technology;
> @@ -433,7 +433,7 @@ void ShillPropertyHandler::**
> UpdateEnabledTechnologies(
>      const base::ListValue& technologies) {
>    enabled_technologies_.clear();
>    NET_LOG_EVENT("**EnabledTechnologiesChanged",
> -                base::StringPrintf("Size: %"PRIuS,
> technologies.GetSize()));
> +                base::StringPrintf("Size: %" PRIuS,
> technologies.GetSize()));
>    for (base::ListValue::const_**iterator iter = technologies.begin();
>         iter != technologies.end(); ++iter) {
>      std::string technology;
> @@ -448,7 +448,7 @@ void ShillPropertyHandler::**
> UpdateUninitializedTechnologie**s(
>      const base::ListValue& technologies) {
>    uninitialized_technologies_.**clear();
>    NET_LOG_EVENT("**UninitializedTechnologiesChang**ed",
> -                base::StringPrintf("Size: %"PRIuS,
> technologies.GetSize()));
> +                base::StringPrintf("Size: %" PRIuS,
> technologies.GetSize()));
>    for (base::ListValue::const_**iterator iter = technologies.begin();
>         iter != technologies.end(); ++iter) {
>      std::string technology;
> Index: dbus/message.cc
> diff --git a/dbus/message.cc b/dbus/message.cc
> index e35171612b072b27fd5e30cd460526**4aa96be517..**
> b52528d9f624ae24ee308ac87040d7**6d1e7e15bc 100644
> --- a/dbus/message.cc
> +++ b/dbus/message.cc
> @@ -173,7 +173,7 @@ std::string Message::ToStringInternal(**const
> std::string& indent,
>          } else {
>            std::string truncated;
>            TruncateUTF8ToByteSize(value, kTruncateLength, &truncated);
> -          base::StringAppendF(&**truncated, "... (%"PRIuS" bytes in
> total)",
> +          base::StringAppendF(&**truncated, "... (%" PRIuS " bytes in
> total)",
>                                value.size());
>            output += indent + "string \"" + truncated + "\"\n";
>          }
>
>
>

[satorux1, 2013-07-31 01:53:01]

LGTM. Sorry for the belated response. Prius needs more space.

[satorux1, 2013-07-31 02:01:02]

On 2013/07/29 21:11:28, Nico wrote:
> This is also an issue in the dbus-1.0 system headers. It seems to be fixed in
> the dbus 1.4 system headers. How difficult is it to switch to dbus 1.4?

Are we still using dbus-1.0? On Chrome OS, we seem to be using dbus-1.6.8.

[Nico, 2013-07-31 02:27:35]

On 2013/07/31 02:01:02, satorux1 wrote:
> On 2013/07/29 21:11:28, Nico wrote:
> > This is also an issue in the dbus-1.0 system headers. It seems to be fixed
in
> > the dbus 1.4 system headers. How difficult is it to switch to dbus 1.4?
> 
> Are we still using dbus-1.0? On Chrome OS, we seem to be using dbus-1.6.8.

build/linux/system.gyp has

    {
      'target_name': 'dbus',
      'type': 'none',
      'direct_dependent_settings': {
        'cflags': [
          '<!@(<(pkg-config) --cflags dbus-1)',
        ],
      },
      'link_settings': {
        'ldflags': [
          '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
        ],
        'libraries': [
          '<!@(<(pkg-config) --libs-only-l dbus-1)',
        ],
      },
    },

[satorux1, 2013-07-31 02:31:06]

On 2013/07/31 02:27:35, Nico wrote:
> On 2013/07/31 02:01:02, satorux1 wrote:
> > On 2013/07/29 21:11:28, Nico wrote:
> > > This is also an issue in the dbus-1.0 system headers. It seems to be fixed
> in
> > > the dbus 1.4 system headers. How difficult is it to switch to dbus 1.4?
> > 
> > Are we still using dbus-1.0? On Chrome OS, we seem to be using dbus-1.6.8.
> 
> build/linux/system.gyp has

dbus-1 here seems to just mean dbus-1.x. On my ubuntu workstation, dbus version
is 1.4.18.

% apt-cache show dbus |grep Version
Version: 1.4.18-1ubuntu1.4




> 
>     {
>       'target_name': 'dbus',
>       'type': 'none',
>       'direct_dependent_settings': {
>         'cflags': [
>           '<!@(<(pkg-config) --cflags dbus-1)',
>         ],
>       },
>       'link_settings': {
>         'ldflags': [
>           '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-1)',
>         ],
>         'libraries': [
>           '<!@(<(pkg-config) --libs-only-l dbus-1)',
>         ],
>       },
>     },

[Nico, 2013-07-31 02:42:50]

Committed patchset #1 manually as r214521 (presubmit successful).

[Nico, 2013-07-31 02:43:54]

Hm. https://code.google.com/p/chromium/issues/detail?id=263960#c6 suggests that
at least the bots are getting the 1.0 headers.

How did they get dbus headers at all? build/install-build-deps.sh doesn't
mention dbus as far as I can tell.

[satorux1, 2013-07-31 03:11:57]

On 2013/07/31 02:43:54, Nico wrote:
> Hm. https://code.google.com/p/chromium/issues/detail?id=263960#c6 suggests
that
> at least the bots are getting the 1.0 headers.
> 
> How did they get dbus headers at all? build/install-build-deps.sh doesn't
> mention dbus as far as I can tell.

/usr/include/dbus-1.0 does not mean that the dbus package version is 1.0. It
seems to also mean dbus-1.x For instance, D-Bus header files are placed in
/usr/include/dbus-1.0 on my workstation despite the fact that the dbus package
version is 1.4.18. #YOLD

My guess is that some bots are still running older ubuntu versions.