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

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

Issue 10535077: TabContentsWrapper -> TabContents, part 12. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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
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/file_path.h" 6 #include "base/file_path.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/extensions/crx_installer.h" 9 #include "chrome/browser/extensions/crx_installer.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 92
93 void CheckPluginsCreated(const Extension* extension, bool should_create) { 93 void CheckPluginsCreated(const Extension* extension, bool should_create) {
94 ui_test_utils::NavigateToURL(browser(), 94 ui_test_utils::NavigateToURL(browser(),
95 extension->GetResourceURL("test.html")); 95 extension->GetResourceURL("test.html"));
96 // Don't run tests if the NaCl plugin isn't loaded. 96 // Don't run tests if the NaCl plugin isn't loaded.
97 if (!IsNaClPluginLoaded()) 97 if (!IsNaClPluginLoaded())
98 return; 98 return;
99 99
100 bool embedded_plugin_created = false; 100 bool embedded_plugin_created = false;
101 bool content_handler_plugin_created = false; 101 bool content_handler_plugin_created = false;
102 WebContents* web_contents = browser()->GetSelectedWebContents(); 102 WebContents* web_contents = browser()->GetActiveWebContents();
103 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 103 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
104 web_contents->GetRenderViewHost(), L"", 104 web_contents->GetRenderViewHost(), L"",
105 L"window.domAutomationController.send(EmbeddedPluginCreated());", 105 L"window.domAutomationController.send(EmbeddedPluginCreated());",
106 &embedded_plugin_created)); 106 &embedded_plugin_created));
107 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 107 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
108 web_contents->GetRenderViewHost(), L"", 108 web_contents->GetRenderViewHost(), L"",
109 L"window.domAutomationController.send(ContentHandlerPluginCreated());", 109 L"window.domAutomationController.send(ContentHandlerPluginCreated());",
110 &content_handler_plugin_created)); 110 &content_handler_plugin_created));
111 111
112 EXPECT_EQ(should_create, embedded_plugin_created); 112 EXPECT_EQ(should_create, embedded_plugin_created);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) { 146 IN_PROC_BROWSER_TEST_F(NaClExtensionTest, UnpackedExtension) {
147 ASSERT_TRUE(test_server()->Start()); 147 ASSERT_TRUE(test_server()->Start());
148 148
149 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED); 149 const Extension* extension = InstallExtension(INSTALL_TYPE_UNPACKED);
150 ASSERT_TRUE(extension); 150 ASSERT_TRUE(extension);
151 ASSERT_EQ(extension->location(), Extension::LOAD); 151 ASSERT_EQ(extension->location(), Extension::LOAD);
152 CheckPluginsCreated(extension, true); 152 CheckPluginsCreated(extension, true);
153 } 153 }
154 154
155 } // namespace 155 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_message_service.cc ('k') | chrome/browser/extensions/extension_override_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698