Use bundled Pepper Flash on Windows (Canary, still on a field trial).

chrome/common/pepper_flash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/component_updater/pepper_flash_field_trial.h"
+#include "chrome/common/pepper_flash.h"
 
+#include "base/basictypes.h"
+#include "base/command_line.h"

[yzshen1, 2012/04/19 18:33:09]

remove this duplicate.

[viettrungluu, 2012/04/19 20:23:16]

Done.

 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
+#include "base/string16.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/installer/util/browser_distribution.h"
+
+#if defined(OS_WIN)
+#include "base/win/metro.h"
+#endif
 
 namespace {
 
 const char* const kFieldTrialName = "PepperFlash";
 const char* const kDisableGroupName = "DisableByDefault";
 const char* const kEnableGroupName = "EnableByDefault";
 int g_disabled_group_number = -1;
 
 void ActivateFieldTrial() {
   // The field trial will expire on Jan 1st, 2014.
@@ skipping 17 matching lines @@
 
   // Disable by default if one time randomization is not available.
   if (!base::FieldTrialList::IsOneTimeRandomizationEnabled())
     return;
 
   trial->UseOneTimeRandomization();
   // 50% goes into the enable-by-default group.
   trial->AppendGroup(kEnableGroupName, 500);
 }
 
-}  // namespace
-
-// static
-bool PepperFlashFieldTrial::InEnableByDefaultGroup() {
+bool IsInFieldTrialGroup() {
   static bool activated = false;
   if (!activated) {
     ActivateFieldTrial();
     activated = true;
   }
 
   int group = base::FieldTrialList::FindValue(kFieldTrialName);
   return group != base::FieldTrial::kNotFinalized &&
          group != g_disabled_group_number;
 }
+
+}  // namespace
+
+bool IsPepperFlashEnabledByDefault() {
+#if defined(USE_AURA)
+  // Pepper Flash is required for Aura (on any OS).
+  return true;
+#elif defined(OS_WIN)
+  // Pepper Flash is required for Windows 8 Metro mode.
+  return true;

[yzshen1, 2012/04/19 18:33:09]

This return true should be removed.

[viettrungluu, 2012/04/19 20:23:16]

Oops! Done.

+  if (base::win::GetMetroModule())
+    return true;
+
+  // For other Windows users, enable only for Canary users in a field trial.
+  if (!IsInFieldTrialGroup())
+    return false;
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  if (!dist)
+    return false;
+  string16 channel;
+  if (!dist->GetChromeChannel(&channel))
+    return false;
+  return (channel == L"canary");
+#elif defined(OS_LINUX)
+  // For Linux, always try to use it (availability is checked elsewhere).
+  return true;
+#else
+  return false;
+#endif
+}