mus: Run content_unittests with --mus

Start running content_unittests with the --mus flags on linux-chromeos
bots.

BUG=786453

Change-Id: Ied53b0f651dbec49ee7a3224623bb69343eaf891
Reviewed-on: https://chromium-review.googlesource.com/817691Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523541}

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -1942,6 +1942,8 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
   DCHECK(!window_);
   DCHECK(!is_mus_browser_plugin_guest_);
   window_ = new aura::Window(this);
+  if (frame_sink_id_.is_valid())
+    window_->set_embed_frame_sink_id(frame_sink_id_);
   window_->SetName("RenderWidgetHostViewAura");
   window_->SetProperty(aura::client::kEmbedType,
                        aura::client::WindowEmbedType::EMBED_IN_OWNER);

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -2345,7 +2345,7 @@ TEST_F(RenderWidgetHostViewAuraTest, AutoResizeWithScale) {
                                                 run_loop.QuitClosure());
   run_loop.Run();
 
-  EXPECT_EQ(1u, sink_->message_count());
+  ASSERT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(static_cast<uint32_t>(ViewMsg_SetLocalSurfaceIdForAutoResize::ID),

testing/buildbot/chromium.chromiumos.json

@@ -960,6 +960,16 @@
         },
         "test": "content_unittests"
       },
+      {
+        "args": [
+          "--mus"
+        ],
+        "name": "mus_content_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.memory.json

@@ -818,6 +818,16 @@
         },
         "test": "content_unittests"
       },
+      {
+        "args": [
+          "--mus"
+        ],
+        "name": "mus_content_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "content_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/test_suites.pyl

@@ -1116,6 +1116,12 @@
         'shards': 5,
       },
     },
+    'mus_content_unittests': {
+      'test': 'content_unittests',
+      'args': [
+        '--mus',
+      ],
+    },
     'content_browsertests --mus': {
       'test': 'content_browsertests',
       'override_isolate_target': 'content_browsertests',