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

Side by Side Diff: chrome/browser/gpu_browsertest.cc

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')
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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/test_launcher_utils.h"
15 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/browser/tab_contents/tab_contents.h" 15 #include "content/browser/tab_contents/tab_contents.h"
17 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
18 #include "net/base/net_util.h" 17 #include "net/base/net_util.h"
19 #include "ui/gfx/gl/gl_implementation.h" 18 #include "ui/gfx/gl/gl_switches.h"
20 19
21 class GPUBrowserTest : public InProcessBrowserTest { 20 class GPUBrowserTest : public InProcessBrowserTest {
22 protected: 21 protected:
23 GPUBrowserTest() { 22 GPUBrowserTest() {
24 EnableDOMAutomation(); 23 EnableDOMAutomation();
25 } 24 }
26 25
27 virtual void SetUpInProcessBrowserTestFixture() { 26 virtual void SetUpInProcessBrowserTestFixture() {
28 FilePath test_dir; 27 FilePath test_dir;
29 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir)); 28 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 ui_test_utils::DOMMessageQueue message_queue; 60 ui_test_utils::DOMMessageQueue message_queue;
62 61
63 ui_test_utils::NavigateToURL( 62 ui_test_utils::NavigateToURL(
64 browser(), 63 browser(),
65 net::FilePathToFileURL(gpu_test_dir_.AppendASCII("canvas_popup.html"))); 64 net::FilePathToFileURL(gpu_test_dir_.AppendASCII("canvas_popup.html")));
66 65
67 std::string result; 66 std::string result;
68 ASSERT_TRUE(message_queue.WaitForMessage(&result)); 67 ASSERT_TRUE(message_queue.WaitForMessage(&result));
69 EXPECT_EQ("\"SUCCESS\"", result); 68 EXPECT_EQ("\"SUCCESS\"", result);
70 } 69 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | chrome/chrome_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698