Revert of Move BrowserWindowPropertyManager tests to interactive_ui_tests and reenable.

chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc

 // Copyright 2013 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 <string>
 
 #include <shlobj.h>  // Must be before propkey.
 #include <propkey.h>
 #include <shellapi.h>
 
@@ skipping 158 matching lines @@
     command_line->AppendSwitch(switches::kEnableProfileShortcutManager);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserTestWithProfileShortcutManager);
 };
 
 // Check that the window properties on Windows are properly set.
 // http://crbug.com/396344
 IN_PROC_BROWSER_TEST_F(BrowserTestWithProfileShortcutManager,
-                       WindowProperties) {
+                       DISABLED_WindowProperties) {
   // Disable this test in Metro+Ash where Windows window properties aren't used.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 
   // This test checks HWND properties that are only available on Win7+.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
   // Single profile case. The profile name should not be shown.
   WaitAndValidateBrowserWindowProperties(base::Bind(
@@ skipping 29 matching lines @@
   Browser* profile2_browser =
       CreateBrowser(profile_manager->GetProfileByPath(path_profile2));
   size_t profile2_index = cache.GetIndexOfProfileWithPath(path_profile2);
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateBrowserWindowProperties,
                  profile2_browser,
                  cache.GetNameOfProfileAtIndex(profile2_index)));
 }
 
 // http://crbug.com/396344
-IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, HostedApp) {
+IN_PROC_BROWSER_TEST_F(BrowserWindowPropertyManagerTest, DISABLED_HostedApp) {
 #if defined(USE_ASH)
   // Disable this test in Metro+Ash where Windows window properties aren't used.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   // This test checks HWND properties that are only available on Win7+.
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return;
 
@@ skipping 18 matching lines @@
   for (chrome::BrowserIterator it; !it.done() && !app_browser; it.Next()) {
     if (*it != browser())
       app_browser = *it;
   }
   ASSERT_TRUE(app_browser);
   ASSERT_TRUE(app_browser != browser());
 
   WaitAndValidateBrowserWindowProperties(
       base::Bind(&ValidateHostedAppWindowProperties, app_browser, extension));
 }