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

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

Issue 2854041: Fix a bug effectively disabling the default plugin. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Add braces. Created 10 years, 5 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
« no previous file with comments | « no previous file | webkit/glue/plugins/plugin_list.cc » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/test/automation/tab_proxy.h" 8 #include "chrome/test/automation/tab_proxy.h"
9 #include "chrome/test/ui/ui_test.h" 9 #include "chrome/test/ui/ui_test.h"
10 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
11 11
12 class DefaultPluginUITest : public UITest { 12 class DefaultPluginUITest : public UITest {
13 public: 13 public:
14 DefaultPluginUITest() { 14 DefaultPluginUITest() {
15 dom_automation_enabled_ = true; 15 dom_automation_enabled_ = true;
16 } 16 }
17 }; 17 };
18 18
19 // Failing consistently: crbug/46662 19 TEST_F(DefaultPluginUITest, DefaultPluginLoadTest) {
20 TEST_F(DefaultPluginUITest, DISABLED_DefaultPluginLoadTest) {
21 // Open page with default plugin. 20 // Open page with default plugin.
22 FilePath test_file(test_data_directory_); 21 FilePath test_file(test_data_directory_);
23 test_file = test_file.AppendASCII("default_plugin.html"); 22 test_file = test_file.AppendASCII("default_plugin.html");
24 NavigateToURL(net::FilePathToFileURL(test_file)); 23 NavigateToURL(net::FilePathToFileURL(test_file));
25 24
26 // Check that the default plugin was loaded. It executes a bit of javascript 25 // Check that the default plugin was loaded. It executes a bit of javascript
27 // in the HTML file which replaces the innerHTML of div |result| with "DONE". 26 // in the HTML file which replaces the innerHTML of div |result| with "DONE".
28 scoped_refptr<TabProxy> tab(GetActiveTab()); 27 scoped_refptr<TabProxy> tab(GetActiveTab());
29 std::wstring out; 28 std::wstring out;
30 ASSERT_TRUE(tab->ExecuteAndExtractString(L"", 29 ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
31 L"domAutomationController.send(" 30 L"domAutomationController.send("
32 L"document.getElementById('result').innerHTML)", &out)); 31 L"document.getElementById('result').innerHTML)", &out));
33 ASSERT_EQ(L"DONE", out); 32 ASSERT_EQ(L"DONE", out);
34 } 33 }
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/plugins/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698