Remove NPAPI from browser and utility

Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212, 123851, 234591, 238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Committed: https://crrev.com/e8c57eac849fb54583b267101793296c5ca0d940
Cr-Commit-Position: refs/heads/master@{#385358}

[piman, 2016-04-05 04:56:31]

Description was changed from

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212
==========

to

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

[piman, 2016-04-05 05:05:52]

Patchset #1 (id:1) has been deleted

[piman, 2016-04-05 05:43:32]

Description was changed from

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

to

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212,123851,234591,238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

[piman, 2016-04-05 06:00:46]

piman@chromium.org changed reviewers:
+ asvitkine@chromium.org, avi@chromium.org, dcheng@chromium.org,
jam@chromium.org, mark@chromium.org, pkasting@chromium.org, sky@chromium.org

[piman, 2016-04-05 06:00:48]

Sorry about the giant CL, but it pretty much only removes stuff (that was
entangled everywhere).

asvitkine: components/metrics/
avi: ui/views_content_client/views_content_client_main_parts_mac.mm
dcheng: chrome/common/render_messages.h
        components/content_settings/content/common/content_settings_messages.h
        content/common/frame_messages.h
        content/common/plugin_process_messages.h
        content/common/utility_messages.h
        content/common/view_messages.h
        ipc/ipc_message_start.h
jam: content/
sky: chrome/
mark: base/mac
pkasting: components/infobars/

https://codereview.chromium.org/1862513003/diff/20001/base/mac/mac_util.h
File base/mac/mac_util.h (left):

https://codereview.chromium.org/1862513003/diff/20001/base/mac/mac_util.h#old...
base/mac/mac_util.h:74: 
Only NPAPI was using those, so I removed.

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/extensio...
File chrome/browser/extensions/plugin_manager.cc (left):

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/extensio...
chrome/browser/extensions/plugin_manager.cc:70: }
Although it's not directly obvious, this only does anything for NPAPI plugins.

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/plugins/...
File chrome/browser/plugins/chrome_plugin_service_filter.h (left):

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/plugins/...
chrome/browser/plugins/chrome_plugin_service_filter.h:51: // URL.
This is only used by extensions for embedded NPAPI plugins

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/plugins/...
File chrome/browser/plugins/plugin_info_message_filter.cc (left):

https://codereview.chromium.org/1862513003/diff/20001/chrome/browser/plugins/...
chrome/browser/plugins/plugin_info_message_filter.cc:400: plugin.type !=
WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN &&
This is always false now (since WebPluginInfo::PLUGIN_TYPE_NPAPI is gone).

https://codereview.chromium.org/1862513003/diff/20001/components/metrics/prot...
File components/metrics/proto/profiler_event.proto (left):

https://codereview.chromium.org/1862513003/diff/20001/components/metrics/prot...
components/metrics/proto/profiler_event.proto:108: PLUGIN = 3;
I'm changing a proto file here - I hope it's ok.

https://codereview.chromium.org/1862513003/diff/20001/content/common/plugin_l...
File content/common/plugin_list.cc (right):

https://codereview.chromium.org/1862513003/diff/20001/content/common/plugin_l...
content/common/plugin_list.cc:128: SetPlugins(new_plugins);
At this point this is pretty much just a roundabout way of doing plugins_list_ =
internal_plugins_. I'll do another pass in a follow up CL to try to simplify
this and PluginServiceImpl.

[dcheng, 2016-04-05 06:12:15]

https://codereview.chromium.org/1862513003/diff/40001/chrome/browser/extensio...
File chrome/browser/extensions/plugin_apitest.cc (left):

https://codereview.chromium.org/1862513003/diff/40001/chrome/browser/extensio...
chrome/browser/extensions/plugin_apitest.cc:57:
test_data_dir_.AppendASCII("uitest").AppendASCII("plugins");
Can we delete
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/data/e...
as well?

https://codereview.chromium.org/1862513003/diff/40001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/40001/content/common/utility_...
content/common/utility_messages.h:15: #include
"content/public/common/webplugininfo.h"
<stdint.h>, <string>, <vector>, "build_config.h", "common_param_traits.h", and
"webplugininfo.h" all appear to be unused now.

[Peter Kasting, 2016-04-05 06:40:07]

LGTM

https://codereview.chromium.org/1862513003/diff/40001/components/infobars/cor...
File components/infobars/core/infobar_delegate.h (left):

https://codereview.chromium.org/1862513003/diff/40001/components/infobars/cor...
components/infobars/core/infobar_delegate.h:100: NPAPI_REMOVAL_INFOBAR_DELEGATE
= 30,
Nit: Rather than remove this line, which might look like someone made a mistake,
I would probably put a "// Removed: " in front of it.

[piman, 2016-04-05 08:13:54]

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

[commit-bot: I haz the power, 2016-04-05 08:14:14]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1862513003/80001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1862513003/80001

[piman, 2016-04-05 08:15:30]

https://codereview.chromium.org/1862513003/diff/40001/chrome/browser/extensio...
File chrome/browser/extensions/plugin_apitest.cc (left):

https://codereview.chromium.org/1862513003/diff/40001/chrome/browser/extensio...
chrome/browser/extensions/plugin_apitest.cc:57:
test_data_dir_.AppendASCII("uitest").AppendASCII("plugins");
On 2016/04/05 06:12:15, dcheng wrote:
> Can we delete
>
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/data/e...
> as well?

I think so. We'll see what trybots say.

https://codereview.chromium.org/1862513003/diff/40001/components/infobars/cor...
File components/infobars/core/infobar_delegate.h (left):

https://codereview.chromium.org/1862513003/diff/40001/components/infobars/cor...
components/infobars/core/infobar_delegate.h:100: NPAPI_REMOVAL_INFOBAR_DELEGATE
= 30,
On 2016/04/05 06:40:07, Peter Kasting wrote:
> Nit: Rather than remove this line, which might look like someone made a
mistake,
> I would probably put a "// Removed: " in front of it.

Done.

https://codereview.chromium.org/1862513003/diff/40001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/40001/content/common/utility_...
content/common/utility_messages.h:15: #include
"content/public/common/webplugininfo.h"
On 2016/04/05 06:12:15, dcheng wrote:
> <stdint.h>, <string>, <vector>, "build_config.h", "common_param_traits.h", and
> "webplugininfo.h" all appear to be unused now.

Done.

[dcheng, 2016-04-05 08:18:04]

ipc changes lgtm

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
content/common/utility_messages.h:7: #include "build/build_config.h"
This one too, I think? Unless I'm missing something.

[commit-bot: I haz the power, 2016-04-05 09:36:44]

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

[commit-bot: I haz the power, 2016-04-05 09:36:45]

Dry run: This issue passed the CQ dry run.

[Avi (use Gerrit), 2016-04-05 12:36:44]

You remove a lot of UMA. Are you cleaning up the histograms xml file too?

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
content/common/utility_messages.h:7: #include "build/build_config.h"
On 2016/04/05 08:18:04, dcheng wrote:
> This one too, I think? Unless I'm missing something.

Yes; that was for OS_* and the file doesn't need it any more.

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
File content/public/common/process_type.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
content/public/common/process_type.h:22: PROCESS_TYPE_WORKER_DEPRECATED,
!!! Comment says to not remove these values; they're used in histograms.

[Alexei Svitkine (slow), 2016-04-05 14:57:22]

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
File components/metrics/proto/profiler_event.proto (left):

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
components/metrics/proto/profiler_event.proto:108: PLUGIN = 3;
Instead of removing this, please add a comment that this is no longer sent as of
Chrome <milestone> due to NPAPI deprecation.

Also, would you mind updating the internal version of this proto in google3 with
the same change?

[piman, 2016-04-05 15:12:09]

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
File components/metrics/proto/profiler_event.proto (left):

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
components/metrics/proto/profiler_event.proto:108: PLUGIN = 3;
On 2016/04/05 14:57:22, Alexei Svitkine wrote:
> Instead of removing this, please add a comment that this is no longer sent as
of
> Chrome <milestone> due to NPAPI deprecation.

Will do.

> Also, would you mind updating the internal version of this proto in google3
with
> the same change?

Sure. Can you point me to the location of the internal version?

[piman, 2016-04-05 15:16:38]

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
content/common/utility_messages.h:7: #include "build/build_config.h"
On 2016/04/05 08:18:04, dcheng wrote:
> This one too, I think? Unless I'm missing something.

You're just missing me being dense/sleepy. I'll remove.

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
File content/public/common/process_type.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
content/public/common/process_type.h:22: PROCESS_TYPE_WORKER_DEPRECATED,
On 2016/04/05 12:36:43, Avi wrote:
> !!! Comment says to not remove these values; they're used in histograms.

Doh. I can either put it back (renaming it to PROCESS_TYPE_PLUGIN_DEPRECATED ?),
or adjust PROCESS_TYPE_WORKER_DEPRECATED to be PROCESS_TYPE_RENDERER+2. Any
preference?

[piman, 2016-04-05 15:19:21]

On Tue, Apr 5, 2016 at 5:36 AM, <avi@chromium.org> wrote:

> You remove a lot of UMA. Are you cleaning up the histograms xml file too?
>

I was planning to clean up a bunch of UMA as a separate pass, actually. We
missed some on previous CLs too. I could add them to this CL - it's quite
large already - or as a follow up.


>
>
https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
> File content/common/utility_messages.h (right):
>
>
>
https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
> content/common/utility_messages.h:7: #include "build/build_config.h"
> On 2016/04/05 08:18:04, dcheng wrote:
> > This one too, I think? Unless I'm missing something.
>
> Yes; that was for OS_* and the file doesn't need it any more.
>
>
>
https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
> File content/public/common/process_type.h (right):
>
>
>
https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
> content/public/common/process_type.h:22: PROCESS_TYPE_WORKER_DEPRECATED,
> !!! Comment says to not remove these values; they're used in histograms.
>
> https://codereview.chromium.org/1862513003/
>

-- 
You received this message because you are subscribed to the Google Groups
"Chromium-reviews" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[Mark Mentovai, 2016-04-05 15:21:23]

LGTM in base/mac

[jam, 2016-04-05 15:54:36]

lgtm

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
File chrome/browser/plugins/chrome_plugin_service_filter.h (right):

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
chrome/browser/plugins/chrome_plugin_service_filter.h:45: void
OverridePluginForFrame(int render_process_id,
this is called by two places. one of them,
chrome/browser/ui/pdf/pdf_unsupported_feature.cc, is not needed anymore (it's
used to display a PDF using Reader's NPAPI plugin)

[sky, 2016-04-05 16:45:29]

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
File chrome/browser/plugins/plugin_info_message_filter.cc (left):

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
chrome/browser/plugins/plugin_info_message_filter.cc:389: // Check if the plugin
or its group is enabled by policy.
Why is it safe to remove this block?

[piman, 2016-04-05 17:10:01]

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
File chrome/browser/plugins/plugin_info_message_filter.cc (left):

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
chrome/browser/plugins/plugin_info_message_filter.cc:389: // Check if the plugin
or its group is enabled by policy.
On 2016/04/05 16:45:29, sky wrote:
> Why is it safe to remove this block?

As I explained in a comment on an earlier PS, the conditions is always false,
because plugin.type can't be NPAPI any more.

[Avi (use Gerrit), 2016-04-05 17:35:35]

LGTM with fixes

Don't worry about doing the histogram XML in this patch, as long as you're
getting to it.

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
File content/public/common/process_type.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
content/public/common/process_type.h:22: PROCESS_TYPE_WORKER_DEPRECATED,
On 2016/04/05 15:16:37, piman wrote:
> On 2016/04/05 12:36:43, Avi wrote:
> > !!! Comment says to not remove these values; they're used in histograms.
> 
> Doh. I can either put it back (renaming it to PROCESS_TYPE_PLUGIN_DEPRECATED
?),
> or adjust PROCESS_TYPE_WORKER_DEPRECATED to be PROCESS_TYPE_RENDERER+2. Any
> preference?

Follow the _DEPRECATED style done on the next line.

[sky, 2016-04-05 19:11:15]

LGTM

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
File chrome/browser/plugins/plugin_info_message_filter.cc (left):

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
chrome/browser/plugins/plugin_info_message_filter.cc:389: // Check if the plugin
or its group is enabled by policy.
On 2016/04/05 17:10:01, piman wrote:
> On 2016/04/05 16:45:29, sky wrote:
> > Why is it safe to remove this block?
> 
> As I explained in a comment on an earlier PS, the conditions is always false,
> because plugin.type can't be NPAPI any more.

Sorry, I missed the comment.

[piman, 2016-04-05 19:55:51]

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

[commit-bot: I haz the power, 2016-04-05 19:56:12]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1862513003/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1862513003/120001

[piman, 2016-04-05 19:59:29]

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
File chrome/browser/plugins/chrome_plugin_service_filter.h (right):

https://codereview.chromium.org/1862513003/diff/80001/chrome/browser/plugins/...
chrome/browser/plugins/chrome_plugin_service_filter.h:45: void
OverridePluginForFrame(int render_process_id,
On 2016/04/05 15:54:35, jam wrote:
> this is called by two places. one of them,
> chrome/browser/ui/pdf/pdf_unsupported_feature.cc, is not needed anymore (it's
> used to display a PDF using Reader's NPAPI plugin)

Thanks. Took a look, I will remove the reader fallback thing, in a follow-up
patch. The other one I don't think we can remove, it's used to force enable the
PDF plugin for print preview.

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
File components/metrics/proto/profiler_event.proto (left):

https://codereview.chromium.org/1862513003/diff/80001/components/metrics/prot...
components/metrics/proto/profiler_event.proto:108: PLUGIN = 3;
On 2016/04/05 14:57:22, Alexei Svitkine wrote:
> Instead of removing this, please add a comment that this is no longer sent as
of
> Chrome <milestone> due to NPAPI deprecation.
> 
> Also, would you mind updating the internal version of this proto in google3
with
> the same change?

Done. I will send you a CL for the internal version.

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
File content/common/utility_messages.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/common/utility_...
content/common/utility_messages.h:7: #include "build/build_config.h"
On 2016/04/05 08:18:04, dcheng wrote:
> This one too, I think? Unless I'm missing something.

Done.

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
File content/public/common/process_type.h (right):

https://codereview.chromium.org/1862513003/diff/80001/content/public/common/p...
content/public/common/process_type.h:22: PROCESS_TYPE_WORKER_DEPRECATED,
On 2016/04/05 17:35:34, Avi wrote:
> On 2016/04/05 15:16:37, piman wrote:
> > On 2016/04/05 12:36:43, Avi wrote:
> > > !!! Comment says to not remove these values; they're used in histograms.
> > 
> > Doh. I can either put it back (renaming it to PROCESS_TYPE_PLUGIN_DEPRECATED
> ?),
> > or adjust PROCESS_TYPE_WORKER_DEPRECATED to be PROCESS_TYPE_RENDERER+2. Any
> > preference?
> 
> Follow the _DEPRECATED style done on the next line.

Done.

[Alexei Svitkine (slow), 2016-04-05 20:25:37]

components/metrics lgtm % the server-side CL - thanks!

[piman, 2016-04-05 20:44:14]

The CQ bit was unchecked by piman@chromium.org

[piman, 2016-04-05 20:44:21]

The CQ bit was checked by piman@chromium.org

[piman, 2016-04-05 20:44:22]

The patchset sent to the CQ was uploaded after l-g-t-m from
pkasting@chromium.org, avi@chromium.org, sky@chromium.org, jam@chromium.org,
dcheng@chromium.org, mark@chromium.org
Link to the patchset: https://codereview.chromium.org/1862513003/#ps120001
(title: "rebase")

[commit-bot: I haz the power, 2016-04-05 20:44:52]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1862513003/120001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1862513003/120001

[commit-bot: I haz the power, 2016-04-05 21:26:06]

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

[commit-bot: I haz the power, 2016-04-05 21:26:10]

Failed to apply patch for chrome/browser/extensions/extension_renderer_state.cc:
While running git apply --index -3 -p1;
  error: chrome/browser/extensions/extension_renderer_state.cc: does not exist
in index

Patch:       chrome/browser/extensions/extension_renderer_state.cc
Index: chrome/browser/extensions/extension_renderer_state.cc
diff --git a/chrome/browser/extensions/extension_renderer_state.cc
b/chrome/browser/extensions/extension_renderer_state.cc
index
5227b27713842be3f36fb61b30b8563b584040a1..b3b4e65e83ef404729c506eb4dcff47661d30cf2
100644
--- a/chrome/browser/extensions/extension_renderer_state.cc
+++ b/chrome/browser/extensions/extension_renderer_state.cc
@@ -206,12 +206,7 @@ void ExtensionRendererState::ClearTabAndWindowId(
 bool ExtensionRendererState::GetTabAndWindowId(
     const  content::ResourceRequestInfo* info, int* tab_id, int* window_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  int render_process_id;
-  if (info->GetProcessType() == content::PROCESS_TYPE_PLUGIN) {
-    render_process_id = info->GetOriginPID();
-  } else {
-    render_process_id = info->GetChildID();
-  }
+  int render_process_id = info->GetChildID();
   int render_view_id = info->GetRouteID();
   RenderId render_id(render_process_id, render_view_id);
   TabAndWindowIdMap::iterator iter = map_.find(render_id);

[commit-bot: I haz the power, 2016-04-05 21:26:13]

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

[piman, 2016-04-05 23:26:17]

The CQ bit was checked by piman@chromium.org

[piman, 2016-04-05 23:26:17]

The patchset sent to the CQ was uploaded after l-g-t-m from avi@chromium.org,
pkasting@chromium.org, sky@chromium.org, jam@chromium.org, dcheng@chromium.org,
mark@chromium.org, asvitkine@chromium.org
Link to the patchset: https://codereview.chromium.org/1862513003/#ps140001
(title: "rebase")

[commit-bot: I haz the power, 2016-04-05 23:26:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1862513003/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1862513003/140001

[commit-bot: I haz the power, 2016-04-06 01:19:51]

Description was changed from

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212,123851,234591,238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

to

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212,123851,234591,238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

[commit-bot: I haz the power, 2016-04-06 01:19:53]

Committed patchset #7 (id:140001)

[commit-bot: I haz the power, 2016-04-06 01:21:43]

Description was changed from

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212,123851,234591,238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
==========

to

==========
Remove NPAPI from browser and utility

This pulls a lot of hairballs but that's pretty much everything left.

BUG=493212,123851,234591,238460
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation

Committed: https://crrev.com/e8c57eac849fb54583b267101793296c5ca0d940
Cr-Commit-Position: refs/heads/master@{#385358}
==========

[commit-bot: I haz the power, 2016-04-06 01:21:46]

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

[Will Harris, 2016-04-06 01:26:49]

🎉 ＼(￣▽￣)／ 🎉