Addressing UX regression on Win10 FRE, and changing timeout behavior

chrome/browser/resources/welcome/win10/inline.js

Index: chrome/browser/resources/welcome/win10/inline.js
diff --git a/chrome/browser/resources/welcome/win10/inline.js b/chrome/browser/resources/welcome/win10/inline.js
index 35c09807a19079d1d6d3afd31e3945f553092962..e5defe2f4085a38a804f6294b386a7e7cdcffb4b 100644
--- a/chrome/browser/resources/welcome/win10/inline.js
+++ b/chrome/browser/resources/welcome/win10/inline.js
@@ -34,7 +34,7 @@ cr.define('inline', function() {
     // Set variables.
     // Determines if the combined variant should be displayed. The combined
     // variant includes instructions on how to pin Chrome to the taskbar.
-    app.isCombined = false;
+    app.isCombined = true;

[tommycli, 2017/02/27 23:17:22]

I guess I'm a bit confused as how changing this works? It appears that the value
is always overwritten when the 'getPinnedToTaskbarState' promise comes back..

[tmartino, 2017/02/28 00:08:53]

Whoops, that's a great catch--this is slightly complicated by the fact that
timing out that system check isn't really something you can intentionally repro
when testing.

The correct bool change is made in the cc file I've just uploaded.

 
     // Set handlers.
     app.computeClasses = computeClasses;