Renames two WorkspaceManager methods so that they are more clearly

ash/wm/workspace/workspace_manager_unittest.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 "ash/wm/workspace/workspace_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 80 matching lines @@
   scoped_ptr<ActivationController> activation_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTest);
 };
 
 // Assertions around adding a normal window.
 TEST_F(WorkspaceManagerTest, AddNormalWindowWhenEmpty) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->SetBounds(gfx::Rect(0, 0, 250, 251));
 
-  ASSERT_TRUE(manager_->IsManagedWindow(w1.get()));
+  ASSERT_TRUE(manager_->ShouldManageWindow(w1.get()));
   EXPECT_FALSE(FindBy(w1.get()));
 
   EXPECT_TRUE(GetRestoreBoundsInScreen(w1.get()) == NULL);
 
   w1->Show();
 
   EXPECT_TRUE(GetRestoreBoundsInScreen(w1.get()) == NULL);
 
   ASSERT_TRUE(w1->layer() != NULL);
   EXPECT_TRUE(w1->layer()->visible());
 
   EXPECT_EQ(250, w1->bounds().width());
   EXPECT_EQ(251, w1->bounds().height());
 
   // Should be 1 workspace, TYPE_NORNMAL with w1.
   ASSERT_EQ(1u, workspaces().size());
   EXPECT_EQ(Workspace::TYPE_MANAGED, workspaces()[0]->type());
   ASSERT_EQ(1u, workspaces()[0]->windows().size());
   EXPECT_EQ(w1.get(), workspaces()[0]->windows()[0]);
 }
 
 // Assertions around maximizing/unmaximizing.
 TEST_F(WorkspaceManagerTest, SingleMaximizeWindow) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->SetBounds(gfx::Rect(0, 0, 250, 251));
 
-  ASSERT_TRUE(manager_->IsManagedWindow(w1.get()));
+  ASSERT_TRUE(manager_->ShouldManageWindow(w1.get()));
 
   w1->Show();
 
   ASSERT_TRUE(w1->layer() != NULL);
   EXPECT_TRUE(w1->layer()->visible());
 
   EXPECT_EQ(250, w1->bounds().width());
   EXPECT_EQ(251, w1->bounds().height());
 
   // Maximize the window.
@@ skipping 146 matching lines @@
   EXPECT_FALSE(w1->layer()->visible());
   ASSERT_TRUE(w2->layer() != NULL);
   EXPECT_TRUE(w2->layer()->visible());
 }
 
 // Makes sure requests to change the bounds of a normal window go through.
 TEST_F(WorkspaceManagerTest, ChangeBoundsOfNormalWindow) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->Show();
 
-  EXPECT_TRUE(manager_->IsManagedWindow(w1.get()));
+  EXPECT_TRUE(manager_->ShouldManageWindow(w1.get()));
   // Setting the bounds should go through since the window is in the normal
   // workspace.
   w1->SetBounds(gfx::Rect(0, 0, 200, 500));
   EXPECT_EQ(200, w1->bounds().width());
   EXPECT_EQ(500, w1->bounds().height());
 }
 
 // Assertions around grid size.
 TEST_F(WorkspaceManagerTest, SnapToGrid) {
   manager_->set_grid_size(8);
@@ skipping 293 matching lines @@
   w1->Show();
 
   scoped_ptr<Window> w2(CreateTestWindow());
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   SetPersistsAcrossAllWorkspaces(
       w2.get(),
       WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_YES);
   w2->Show();
 
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
-  ASSERT_FALSE(manager_->IsManagedWindow(w2.get()));
+  ASSERT_FALSE(manager_->ShouldManageWindow(w2.get()));
   EXPECT_EQ(WorkspaceManager::WINDOW_STATE_FULL_SCREEN,
             manager_->GetWindowState());
 
   w2->Hide();
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 
   w2->Show();
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
 
   w2.reset();
@@ skipping 15 matching lines @@
   scoped_ptr<Window> w2(CreateTestWindow());
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   SetPersistsAcrossAllWorkspaces(
       w2.get(),
       WINDOW_PERSISTS_ACROSS_ALL_WORKSPACES_VALUE_YES);
   w2->Show();
 
   // Even though auto-hide behavior is NEVER full-screen windows cause the shelf
   // to hide.
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
-  ASSERT_FALSE(manager_->IsManagedWindow(w2.get()));
+  ASSERT_FALSE(manager_->ShouldManageWindow(w2.get()));
   EXPECT_EQ(WorkspaceManager::WINDOW_STATE_FULL_SCREEN,
             manager_->GetWindowState());
 
   w2->Hide();
   EXPECT_EQ(ShelfLayoutManager::VISIBLE, shelf->visibility_state());
 
   w2->Show();
   EXPECT_EQ(ShelfLayoutManager::HIDDEN, shelf->visibility_state());
   EXPECT_EQ(WorkspaceManager::WINDOW_STATE_FULL_SCREEN,
             manager_->GetWindowState());
@@ skipping 11 matching lines @@
   w1->Show();
   w1->SetProperty(aura::client::kAnimationsDisabledKey, true);
 
   w2->Show();
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(w1->GetProperty(aura::client::kAnimationsDisabledKey));
 }
 
 }  // namespace internal
 }  // namespace ash