Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865
Committed: https://crrev.com/6f9a1d41f9513ff48b3f902dca6dc0d24bd91f29
Cr-Commit-Position: refs/heads/master@{#412259}

[Avi (use Gerrit), 2016-08-14 21:22:45]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-14 21:22:53]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-14 21:41:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-14 21:41:55]

Dry run: Exceeded global retry quota

[Avi (use Gerrit), 2016-08-14 22:31:27]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-14 22:31:39]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Avi (use Gerrit), 2016-08-14 22:36:27]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-14 22:36:39]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Avi (use Gerrit), 2016-08-14 22:38:03]

Description was changed from

==========
Remove use of stl_util's STLDeleteContainerPairPointers from content/.

BUG=555865
==========

to

==========
Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865
==========

[commit-bot: I haz the power, 2016-08-14 23:15:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-14 23:15:32]

Dry run: Exceeded global retry quota

[Avi (use Gerrit), 2016-08-15 00:02:05]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-15 00:02:12]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-15 00:50:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-15 00:50:31]

Dry run: This issue passed the CQ dry run.

[Avi (use Gerrit), 2016-08-15 00:51:29]

avi@chromium.org changed reviewers:
+ jam@chromium.org

[Avi (use Gerrit), 2016-08-15 00:52:22]

avi@chromium.org changed reviewers:
+ sergeyu@chromium.org

[Avi (use Gerrit), 2016-08-15 00:52:22]

Sergey for p2p

[jam, 2016-08-15 16:33:33]

can you please send this to another reviewer?

[Sergey Ulanov, 2016-08-15 16:54:59]

LGTM. Thanks for the cleanup!

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_tcp.cc (right):

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_tcp.cc:73: DCHECK(socket.get());
nit: don't need .get() here

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_tcp_server.cc (right):

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_tcp_server.cc:141: return NULL;
nit: nullptr

[Avi (use Gerrit), 2016-08-15 17:41:09]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-15 17:41:36]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Avi (use Gerrit), 2016-08-15 18:10:28]

avi@chromium.org changed reviewers:
+ nick@chromium.org
- jam@chromium.org

[Avi (use Gerrit), 2016-08-15 18:10:29]

Nick, something I threw together over the weekend.

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_tcp.cc (right):

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_tcp.cc:73: DCHECK(socket.get());
On 2016/08/15 16:54:59, Sergey Ulanov wrote:
> nit: don't need .get() here

Done.

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_tcp_server.cc (right):

https://codereview.chromium.org/2249473002/diff/60001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_tcp_server.cc:141: return NULL;
On 2016/08/15 16:54:59, Sergey Ulanov wrote:
> nit: nullptr

Done.

[commit-bot: I haz the power, 2016-08-15 18:40:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-15 18:40:58]

Dry run: This issue passed the CQ dry run.

[ncarter (slow), 2016-08-15 21:51:33]

lgtm

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
File content/browser/appcache/appcache_storage.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
content/browser/appcache/appcache_storage.cc:49:
storage_->pending_info_loads_.insert(PendingResponseInfoLoads::value_type(
Does map::emplace(key, value) work here (letting you omit the value_type)?

https://codereview.chromium.org/2249473002/diff/80001/content/browser/indexed...
File content/browser/indexed_db/indexed_db_backing_store.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/indexed...
content/browser/indexed_db/indexed_db_backing_store.cc:4252: }
It seems like this can be further simplified (maybe to the following)

if (backing_store_->is_incognito()) {
  for (auto& iter : blob_change_map_) {
    if (iter.second) {
      backing_store_->incognito_blob_map_[iter.first] = std::move(iter.second);
    } else {
      backing_store_->incognito_blob_map_.erase(iter.first);
    }
  }
}

But it's fine if you want to keep the edits minimal.

https://codereview.chromium.org/2249473002/diff/80001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_udp.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_udp.cc:409: return NULL;
nullptr

[Avi (use Gerrit), 2016-08-15 23:42:45]

The CQ bit was checked by avi@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-15 23:43:10]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Avi (use Gerrit), 2016-08-15 23:46:49]

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
File content/browser/appcache/appcache_storage.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
content/browser/appcache/appcache_storage.cc:49:
storage_->pending_info_loads_.insert(PendingResponseInfoLoads::value_type(
On 2016/08/15 21:51:33, ncarter wrote:
> Does map::emplace(key, value) work here (letting you omit the value_type)?

Nice, and it lets me drop the typedef.

https://codereview.chromium.org/2249473002/diff/80001/content/browser/indexed...
File content/browser/indexed_db/indexed_db_backing_store.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/indexed...
content/browser/indexed_db/indexed_db_backing_store.cc:4252: }
On 2016/08/15 21:51:33, ncarter wrote:
> It seems like this can be further simplified (maybe to the following)
> 
> if (backing_store_->is_incognito()) {
>   for (auto& iter : blob_change_map_) {
>     if (iter.second) {
>       backing_store_->incognito_blob_map_[iter.first] =
std::move(iter.second);
>     } else {
>       backing_store_->incognito_blob_map_.erase(iter.first);
>     }
>   }
> }
> 
> But it's fine if you want to keep the edits minimal.

Yes, I'm convinced your rewrite is correct; going for it.

https://codereview.chromium.org/2249473002/diff/80001/content/browser/rendere...
File content/browser/renderer_host/p2p/socket_host_udp.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/rendere...
content/browser/renderer_host/p2p/socket_host_udp.cc:409: return NULL;
On 2016/08/15 21:51:33, ncarter wrote:
> nullptr

Done.

[commit-bot: I haz the power, 2016-08-16 00:00:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-16 00:00:52]

Dry run: Try jobs failed on following builders:
  linux_chromium_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[Avi (use Gerrit), 2016-08-16 14:59:02]

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
File content/browser/appcache/appcache_storage.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
content/browser/appcache/appcache_storage.cc:49:
storage_->pending_info_loads_.insert(PendingResponseInfoLoads::value_type(
On 2016/08/15 23:46:49, Avi wrote:
> On 2016/08/15 21:51:33, ncarter wrote:
> > Does map::emplace(key, value) work here (letting you omit the value_type)?
> 
> Nice, and it lets me drop the typedef.

No, unfortunately map::emplace doesn't exist on the version of libstdc++ that
we're using on Linux. That's apparently called out at
https://chromium-cpp.appspot.com/, though we must have missed that.

[Avi (use Gerrit), 2016-08-16 15:27:45]

The CQ bit was checked by avi@chromium.org

[Avi (use Gerrit), 2016-08-16 15:27:46]

The patchset sent to the CQ was uploaded after l-g-t-m from
sergeyu@chromium.org, nick@chromium.org
Link to the patchset: https://codereview.chromium.org/2249473002/#ps120001
(title: "rebase")

[commit-bot: I haz the power, 2016-08-16 15:28:04]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-16 16:07:46]

Description was changed from

==========
Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865
==========

to

==========
Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865
==========

[commit-bot: I haz the power, 2016-08-16 16:07:47]

Committed patchset #7 (id:120001)

[commit-bot: I haz the power, 2016-08-16 16:11:07]

Description was changed from

==========
Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865
==========

to

==========
Remove use of stl_util's STLDeleteContainerPairSecondPointers from content/.

BUG=555865

Committed: https://crrev.com/6f9a1d41f9513ff48b3f902dca6dc0d24bd91f29
Cr-Commit-Position: refs/heads/master@{#412259}
==========

[commit-bot: I haz the power, 2016-08-16 16:11:08]

Patchset 7 (id:??) landed as
https://crrev.com/6f9a1d41f9513ff48b3f902dca6dc0d24bd91f29
Cr-Commit-Position: refs/heads/master@{#412259}

[ncarter (slow), 2016-08-16 18:41:19]

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
File content/browser/appcache/appcache_storage.cc (right):

https://codereview.chromium.org/2249473002/diff/80001/content/browser/appcach...
content/browser/appcache/appcache_storage.cc:49:
storage_->pending_info_loads_.insert(PendingResponseInfoLoads::value_type(
On 2016/08/16 14:59:02, Avi wrote:
> On 2016/08/15 23:46:49, Avi wrote:
> > On 2016/08/15 21:51:33, ncarter wrote:
> > > Does map::emplace(key, value) work here (letting you omit the value_type)?
> > 
> > Nice, and it lets me drop the typedef.
> 
> No, unfortunately map::emplace doesn't exist on the version of libstdc++ that
> we're using on Linux. That's apparently called out at
> https://chromium-cpp.appspot.com/, though we must have missed that.

Sorry for the wild goose chase, then. At least we learned something.