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

Side by Side Diff: content/test/content_browser_test_test.cc

Issue 16465005: Fix dcheck in ContentBrowserTestSanityTest.SingleProcess in win aura. The problem was that GpuProce… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | no next file » | 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 "content/test/content_browser_test.h" 5 #include "content/test/content_browser_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 20 matching lines...) Expand all
31 NavigateToURL(shell(), url); 31 NavigateToURL(shell(), url);
32 string16 title = title_watcher.WaitAndGetTitle(); 32 string16 title = title_watcher.WaitAndGetTitle();
33 EXPECT_EQ(expected_title, title); 33 EXPECT_EQ(expected_title, title);
34 } 34 }
35 }; 35 };
36 36
37 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) { 37 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) {
38 Test(); 38 Test();
39 } 39 }
40 40
41 #if !(defined(OS_WIN) && defined(USE_AURA)) // TODO(jam) fix dcheck.
42 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, SingleProcess) { 41 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, SingleProcess) {
43 Test(); 42 Test();
44 } 43 }
45 #endif
46 44
47 } // namespace content 45 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698