Makes maximized windows go in their own workspace regardless of

ash/wm/workspace/workspace_manager_unittest.cc

Index: ash/wm/workspace/workspace_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc
index 64b22c344f4231c4e870907004ff3eafec8638a1..4f6a5f86bffcb2cb218444c49337c50d9d6115fc 100644
--- a/ash/wm/workspace/workspace_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_manager_unittest.cc
@@ -672,5 +672,27 @@ TEST_F(WorkspaceManagerTest, DontResetAnimation) {
   EXPECT_TRUE(w1->GetProperty(aura::client::kAnimationsDisabledKey));
 }
 
+// Verifies a window marked as persisting across all workspaces ends up in its
+// own workspace when maximized.
+TEST_F(WorkspaceManagerTest, MaximizeDontPersistEndsUpInOwnWorkspace) {
+  scoped_ptr<Window> w1(CreateTestWindow());
+
+  SetPersistsAcrossAllWorkspaces(
+      w1.get(),
+      WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_YES);
+  w1->Show();
+
+  // Shouldn't contain the window initially.
+  EXPECT_FALSE(manager_->Contains(w1.get()));
+
+  // Maximize should trigger containing the window.
+  w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
+  EXPECT_TRUE(manager_->Contains(w1.get()));
+
+  // And resetting to normal should remove it.
+  w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
+  EXPECT_FALSE(manager_->Contains(w1.get()));
+}
+
 }  // namespace internal
 }  // namespace ash