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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host_uitest.cc

Issue 9838033: Upstream native crash handling changes for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Removed a stale comment. Created 8 years, 8 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <sstream> 5 #include <sstream>
6 #include <string> 6 #include <string>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 // app isn't stripped of debug symbols, this takes about five minutes to 281 // app isn't stripped of debug symbols, this takes about five minutes to
282 // complete and isn't conducive to quick turnarounds. As we don't currently 282 // complete and isn't conducive to quick turnarounds. As we don't currently
283 // strip the app on the build bots, this is bad times. 283 // strip the app on the build bots, this is bad times.
284 TEST_F(ResourceDispatcherTest, FAILS_CrossSiteAfterCrash) { 284 TEST_F(ResourceDispatcherTest, FAILS_CrossSiteAfterCrash) {
285 scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); 285 scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
286 ASSERT_TRUE(browser_proxy.get()); 286 ASSERT_TRUE(browser_proxy.get());
287 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); 287 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
288 ASSERT_TRUE(tab.get()); 288 ASSERT_TRUE(tab.get());
289 289
290 // Cause the renderer to crash. 290 // Cause the renderer to crash.
291 #if defined(OS_WIN) || defined(USE_LINUX_BREAKPAD) 291 #if defined(OS_WIN) || defined(USE_POSIX_BREAKPAD)
292 expected_crashes_ = 1; 292 expected_crashes_ = 1;
293 #endif 293 #endif
294 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kChromeUICrashURL))); 294 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kChromeUICrashURL)));
295 // Wait for browser to notice the renderer crash. 295 // Wait for browser to notice the renderer crash.
296 base::PlatformThread::Sleep(TestTimeouts::action_timeout()); 296 base::PlatformThread::Sleep(TestTimeouts::action_timeout());
297 297
298 // Navigate to a new cross-site page. The browser should not wait around for 298 // Navigate to a new cross-site page. The browser should not wait around for
299 // the old renderer's on{before}unload handlers to run. 299 // the old renderer's on{before}unload handlers to run.
300 CheckTitleTest("content-sniffer-test0.html", 300 CheckTitleTest("content-sniffer-test0.html",
301 "Content Sniffer Test 0", 1); 301 "Content Sniffer Test 0", 1);
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 GURL broken_url("chrome://theme"); 414 GURL broken_url("chrome://theme");
415 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url)); 415 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url));
416 416
417 // Make sure the navigation finishes. 417 // Make sure the navigation finishes.
418 std::wstring tab_title; 418 std::wstring tab_title;
419 EXPECT_TRUE(tab->GetTabTitle(&tab_title)); 419 EXPECT_TRUE(tab->GetTabTitle(&tab_title));
420 EXPECT_EQ(L"chrome://theme/ is not available", tab_title); 420 EXPECT_EQ(L"chrome://theme/ is not available", tab_title);
421 } 421 }
422 422
423 } // namespace 423 } // namespace
OLDNEW
« chrome/common/logging_chrome_uitest.cc ('K') | « chrome/common/logging_chrome_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698