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

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

Issue 6001010: Move platform_thread to base/threading and put in the base namespace. I left ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 ASSERT_TRUE(browser_proxy.get()); 209 ASSERT_TRUE(browser_proxy.get());
210 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab()); 210 scoped_refptr<TabProxy> tab(browser_proxy->GetActiveTab());
211 ASSERT_TRUE(tab.get()); 211 ASSERT_TRUE(tab.get());
212 212
213 // Cause the renderer to crash. 213 // Cause the renderer to crash.
214 #if defined(OS_WIN) || defined(USE_LINUX_BREAKPAD) 214 #if defined(OS_WIN) || defined(USE_LINUX_BREAKPAD)
215 expected_crashes_ = 1; 215 expected_crashes_ = 1;
216 #endif 216 #endif
217 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL))); 217 ASSERT_TRUE(tab->NavigateToURLAsync(GURL(chrome::kAboutCrashURL)));
218 // Wait for browser to notice the renderer crash. 218 // Wait for browser to notice the renderer crash.
219 PlatformThread::Sleep(sleep_timeout_ms()); 219 base::PlatformThread::Sleep(sleep_timeout_ms());
220 220
221 // Navigate to a new cross-site page. The browser should not wait around for 221 // Navigate to a new cross-site page. The browser should not wait around for
222 // the old renderer's on{before}unload handlers to run. 222 // the old renderer's on{before}unload handlers to run.
223 CheckTitleTest(L"content-sniffer-test0.html", 223 CheckTitleTest(L"content-sniffer-test0.html",
224 L"Content Sniffer Test 0", 1); 224 L"Content Sniffer Test 0", 1);
225 } 225 }
226 #endif // !defined(OS_MACOSX) 226 #endif // !defined(OS_MACOSX)
227 227
228 // Tests that cross-site navigations work when the new page does not go through 228 // Tests that cross-site navigations work when the new page does not go through
229 // the BufferedEventHandler (e.g., non-http{s} URLs). (Bug 1225872) 229 // the BufferedEventHandler (e.g., non-http{s} URLs). (Bug 1225872)
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 GURL broken_url("chrome://theme"); 326 GURL broken_url("chrome://theme");
327 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url)); 327 ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(broken_url));
328 328
329 // Make sure the navigation finishes. 329 // Make sure the navigation finishes.
330 std::wstring tab_title; 330 std::wstring tab_title;
331 EXPECT_TRUE(tab->GetTabTitle(&tab_title)); 331 EXPECT_TRUE(tab->GetTabTitle(&tab_title));
332 EXPECT_EQ(L"chrome://theme/ is not available", tab_title); 332 EXPECT_EQ(L"chrome://theme/ is not available", tab_title);
333 } 333 }
334 334
335 } // namespace 335 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/printing/printing_layout_uitest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698