Automated ui test porting + cleanup:...

chrome/browser/browser_uitest.cc

 // Copyright (c) 2006-2008 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 "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 class BrowserTest : public UITest {
- protected:
-#if defined(OS_WIN)
-  HWND GetMainWindow() {
-    scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
-    scoped_refptr<WindowProxy> window(browser->GetWindow());
-
-    HWND window_handle;
-    EXPECT_TRUE(window->GetHWND(&window_handle));
-    return window_handle;
-  }
-#endif
 };
 
 class VisibleBrowserTest : public UITest {
  protected:
   VisibleBrowserTest() : UITest() {
     show_window_ = true;
   }
 };
 
 #if defined(OS_WIN)
 // The browser should quit quickly if it receives a WM_ENDSESSION message.
 TEST_F(BrowserTest, WindowsSessionEnd) {
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title1.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
   PlatformThread::Sleep(action_timeout_ms());
 
-  // Simulate an end of session. Normally this happens when the user
-  // shuts down the pc or logs off.
-  HWND window_handle = GetMainWindow();
-  ASSERT_TRUE(::PostMessageW(window_handle, WM_ENDSESSION, 0, 0));
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser->TerminateSession());
 
   PlatformThread::Sleep(action_timeout_ms());
   ASSERT_FALSE(IsBrowserRunning());
 
   // Make sure the UMA metrics say we didn't crash.
   scoped_ptr<DictionaryValue> local_prefs(GetLocalState());
   bool exited_cleanly;
   ASSERT_TRUE(local_prefs.get());
   ASSERT_TRUE(local_prefs->GetBoolean(prefs::kStabilityExitedCleanly,
                                       &exited_cleanly));
@@ skipping 181 matching lines @@
 
   GURL url = net::FilePathToFileURL(test_file);
   ASSERT_TRUE(tab->NavigateToURL(url));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
         "status", kTestIntervalMs, kTestWaitTimeoutMs);
   ASSERT_STREQ("Disallowed", value.c_str());
 }
 
 }  // namespace