diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/content/browser/gpu/gpu_functional_browsertest.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/content/browser/gpu/gpu_functional_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/gpu/gpu_functional_browsertest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/content/browser/gpu/gpu_functional_browsertest.cc b/chromium/content/browser/gpu/gpu_functional_browsertest.cc index b3c2a57319f..4e95d2d5c11 100644 --- a/chromium/content/browser/gpu/gpu_functional_browsertest.cc +++ b/chromium/content/browser/gpu/gpu_functional_browsertest.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" @@ -70,7 +70,6 @@ class GpuFunctionalTest : public ContentBrowserTest { } void VerifyGPUProcessOnPage(std::string filename, bool wait) { - Shell::Initialize(); ASSERT_TRUE(test_server()->Start()); DOMMessageQueue message_queue; |