Re-enable calls on |display_manager_| for Windows in DisplayManagerTestApi

ash/test/display_manager_test_api.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/test/display_manager_test_api.h"
 
 #include <cstdarg>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 91 matching lines @@
     for (std::vector<DisplayInfo>::iterator iter = display_info_list.begin();
          iter != display_info_list.end(); ++iter) {
       gfx::Rect bounds(iter->bounds_in_native().size());
       bounds.set_x(1);
       bounds.set_y(next_y);
       next_y += bounds.height();
       iter->SetBounds(bounds);
     }
   }
 
-// TODO(msw): This seems to cause test hangs on Windows. http://crbug.com/584038
-#if !defined(OS_WIN)
   display_manager_->OnNativeDisplaysChanged(display_info_list);
   display_manager_->UpdateInternalDisplayModeListForTest();
   display_manager_->RunPendingTasksForTest();
-#endif
 }
 
 int64_t DisplayManagerTestApi::SetFirstDisplayAsInternalDisplay() {
   const display::Display& internal = display_manager_->active_display_list_[0];
   SetInternalDisplayId(internal.id());
   return display::Display::InternalDisplayId();
 }
 
 void DisplayManagerTestApi::SetInternalDisplayId(int64_t id) {
   display::Display::SetInternalDisplayId(id);
@@ skipping 71 matching lines @@
   for (size_t i = 0; i < count; i++) {
     int64_t id = va_arg(args, int64_t);
     list.push_back(id);
   }
   SortDisplayIdList(&list);
   return list;
 }
 
 }  // namespace test
 }  // namespace ash