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

Side by Side Diff: chrome/browser/extensions/web_view_browsertest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanupcompositor: No LOG(INFO)s Created 7 years, 4 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 "base/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/automation/automation_util.h" 7 #include "chrome/browser/automation/automation_util.h"
8 #include "chrome/browser/extensions/extension_test_message_listener.h" 8 #include "chrome/browser/extensions/extension_test_message_listener.h"
9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" 9 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
10 #include "chrome/browser/prerender/prerender_link_manager.h" 10 #include "chrome/browser/prerender/prerender_link_manager.h"
11 #include "chrome/browser/prerender/prerender_link_manager_factory.h" 11 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/extensions/extension.h" 15 #include "chrome/common/extensions/extension.h"
16 #include "chrome/test/base/test_launcher_utils.h" 16 #include "chrome/test/base/test_launcher_utils.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/notification_service.h" 18 #include "content/public/browser/notification_service.h"
19 #include "content/public/browser/render_process_host.h" 19 #include "content/public/browser/render_process_host.h"
20 #include "content/public/browser/web_contents_delegate.h" 20 #include "content/public/browser/web_contents_delegate.h"
21 #include "content/public/test/browser_test_utils.h" 21 #include "content/public/test/browser_test_utils.h"
22 #include "content/public/test/fake_speech_recognition_manager.h" 22 #include "content/public/test/fake_speech_recognition_manager.h"
23 #include "net/test/embedded_test_server/embedded_test_server.h" 23 #include "net/test/embedded_test_server/embedded_test_server.h"
24 #include "net/test/embedded_test_server/http_request.h" 24 #include "net/test/embedded_test_server/http_request.h"
25 #include "net/test/embedded_test_server/http_response.h" 25 #include "net/test/embedded_test_server/http_response.h"
26 #include "ui/compositor/compositor_setup.h"
27 #include "ui/gl/gl_switches.h" 26 #include "ui/gl/gl_switches.h"
28 27
29 using prerender::PrerenderLinkManager; 28 using prerender::PrerenderLinkManager;
30 using prerender::PrerenderLinkManagerFactory; 29 using prerender::PrerenderLinkManagerFactory;
31 30
32 namespace { 31 namespace {
33 const char kEmptyResponsePath[] = "/close-socket"; 32 const char kEmptyResponsePath[] = "/close-socket";
34 const char kRedirectResponsePath[] = "/server-redirect"; 33 const char kRedirectResponsePath[] = "/server-redirect";
35 const char kRedirectResponseFullPath[] = 34 const char kRedirectResponseFullPath[] =
36 "/extensions/platform_apps/web_view/shim/guest_redirect.html"; 35 "/extensions/platform_apps/web_view/shim/guest_redirect.html";
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 "DoneDialogTest.FAILED", 1416 "DoneDialogTest.FAILED",
1418 "web_view/dialog"); 1417 "web_view/dialog");
1419 } 1418 }
1420 1419
1421 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) { 1420 IN_PROC_BROWSER_TEST_F(WebViewTest, Dialog_TestPromptDialog) {
1422 TestHelper("testPromptDialog", 1421 TestHelper("testPromptDialog",
1423 "DoneDialogTest.PASSED", 1422 "DoneDialogTest.PASSED",
1424 "DoneDialogTest.FAILED", 1423 "DoneDialogTest.FAILED",
1425 "web_view/dialog"); 1424 "web_view/dialog");
1426 } 1425 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698