Fix linker error for kWin10AcceleratedDefaultBrowserFlow on Win builds

Change-Id: Ib04aa2ea883da8f4bc170c564f49b534e14cd3d7
Reviewed-on: https://chromium-review.googlesource.com/950477
Reviewed-by: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/branch-heads/3325@{#668}
Cr-Branched-From: bc084a8b5afa3744a74927344e304c02ae54189f-refs/heads/master@{#530369}
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
index 6a64586..7fdf17c 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -561,6 +561,12 @@
                                            base::FEATURE_ENABLED_BY_DEFAULT};
 #endif
 
+#if defined(OS_WIN)
+// Enables the accelerated default browser flow for Windows 10.
+const base::Feature kWin10AcceleratedDefaultBrowserFlow{
+    "Win10AcceleratedDefaultBrowserFlow", base::FEATURE_DISABLED_BY_DEFAULT};
+#endif  // defined(OS_WIN)
+
 #if defined(OS_CHROMEOS)
 // Enables or disables the opt-in IME menu in the language settings page.
 const base::Feature kOptInImeMenu{"OptInImeMenu",
@@ -610,12 +616,6 @@
 const base::Feature kTPMFirmwareUpdate{"TPMFirmwareUpdate",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
 
-#if defined(OS_WIN)
-// Enables the accelerated default browser flow for Windows 10.
-const base::Feature kWin10AcceleratedDefaultBrowserFlow{
-    "Win10AcceleratedDefaultBrowserFlow", base::FEATURE_DISABLED_BY_DEFAULT};
-#endif  // defined(OS_WIN)
-
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace features
diff --git a/chrome/common/chrome_features.h b/chrome/common/chrome_features.h
index 49b9993..a8a9875 100644
--- a/chrome/common/chrome_features.h
+++ b/chrome/common/chrome_features.h
@@ -300,6 +300,10 @@
 extern const base::Feature kVoiceSearchOnLocalNtp;
 #endif
 
+#if defined(OS_WIN)
+extern const base::Feature kWin10AcceleratedDefaultBrowserFlow;
+#endif  // defined(OS_WIN)
+
 #if defined(OS_CHROMEOS)
 extern const base::Feature kOptInImeMenu;
 
@@ -326,10 +330,6 @@
 extern const base::Feature kTPMFirmwareUpdate;
 #endif  // defined(OS_CHROMEOS)
 
-#if defined(OS_WIN)
-extern const base::Feature kWin10AcceleratedDefaultBrowserFlow;
-#endif  // defined(OS_WIN)
-
 bool PrefServiceEnabled();
 
 // DON'T ADD RANDOM STUFF HERE. Put it in the main section above in