Remove persisted docked windows

chrome/browser/ui/window_sizer/window_sizer.cc

Index: chrome/browser/ui/window_sizer/window_sizer.cc
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index 446d11682437d9ec20d8b20cec0c293936df6b92..2848985a34a973b9ad1e28c01343a9ed02325767 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -23,6 +23,7 @@
 #include "ui/display/screen.h"
 
 #if defined(USE_ASH)
+#include "ash/common/ash_switches.h"
 #include "ash/common/wm/window_positioner.h"  // nogncheck
 #include "ash/shell.h"  // nogncheck
 #include "chrome/browser/ui/ash/ash_util.h"  // nogncheck
@@ -80,11 +81,14 @@ class DefaultStateProvider : public WindowSizer::StateProvider {
       if (*show_state == ui::SHOW_STATE_DEFAULT && maximized)
         *show_state = ui::SHOW_STATE_MAXIMIZED;
 #if defined(USE_ASH)
-      bool docked = false;
-      wp_pref->GetBoolean("docked", &docked);
-      if (*show_state == ui::SHOW_STATE_DEFAULT && docked &&
-          !browser_->is_type_tabbed()) {
-        *show_state = ui::SHOW_STATE_DOCKED;
+      // TODO(afakhry): Remove Docked Windows in M58.
+      if (ash::switches::DockedWindowsEnabled()) {
+        bool docked = false;
+        wp_pref->GetBoolean("docked", &docked);
+        if (*show_state == ui::SHOW_STATE_DEFAULT && docked &&
+            !browser_->is_type_tabbed()) {
+          *show_state = ui::SHOW_STATE_DOCKED;
+        }
       }
 #endif  // USE_ASH
     }