Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Side by Side Diff: chrome/browser/ui/tests/browser_uitest.cc

Issue 8390041: Call VerifyCleanExit in TerminateBrowser. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: missed a file Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/unload_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 30 matching lines...) Expand all
41 } // namespace 41 } // namespace
42 42
43 // The browser should quit quickly if it receives a WM_ENDSESSION message 43 // The browser should quit quickly if it receives a WM_ENDSESSION message
44 // on Windows, or SIGTERM on posix. 44 // on Windows, or SIGTERM on posix.
45 TEST_F(BrowserTest, SessionEnd) { 45 TEST_F(BrowserTest, SessionEnd) {
46 FilePath test_file(test_data_directory_); 46 FilePath test_file(test_data_directory_);
47 test_file = test_file.AppendASCII("title1.html"); 47 test_file = test_file.AppendASCII("title1.html");
48 48
49 NavigateToURL(net::FilePathToFileURL(test_file)); 49 NavigateToURL(net::FilePathToFileURL(test_file));
50 TerminateBrowser(); 50 TerminateBrowser();
51 VerifyCleanExit();
52 } 51 }
53 52
54 // WindowOpenClose is flaky on ChromeOS and fails consistently on linux views. 53 // WindowOpenClose is flaky on ChromeOS and fails consistently on linux views.
55 // See http://crbug.com/85763. 54 // See http://crbug.com/85763.
56 #if defined (OS_CHROMEOS) 55 #if defined (OS_CHROMEOS)
57 #define MAYBE_WindowOpenClose FLAKY_WindowOpenClose 56 #define MAYBE_WindowOpenClose FLAKY_WindowOpenClose
58 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS) 57 #elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
59 #define MAYBE_WindowOpenClose FAILS_WindowOpenClose 58 #define MAYBE_WindowOpenClose FAILS_WindowOpenClose
60 #else 59 #else
61 #define MAYBE_WindowOpenClose WindowOpenClose 60 #define MAYBE_WindowOpenClose WindowOpenClose
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 243
245 // Verify that the window is present. 244 // Verify that the window is present.
246 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); 245 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
247 ASSERT_TRUE(browser.get()); 246 ASSERT_TRUE(browser.get());
248 247
249 // Verify the browser is in application mode. 248 // Verify the browser is in application mode.
250 bool is_application; 249 bool is_application;
251 ASSERT_TRUE(browser->IsApplication(&is_application)); 250 ASSERT_TRUE(browser->IsApplication(&is_application));
252 EXPECT_TRUE(is_application); 251 EXPECT_TRUE(is_application);
253 } 252 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/unload_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698