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

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

Issue 8828005: Disable ExtensionBrowserTest.PluginPrivat on chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 | no next file » | 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) 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/extensions/autoupdate_interceptor.h" 8 #include "chrome/browser/extensions/autoupdate_interceptor.h"
9 #include "chrome/browser/extensions/extension_apitest.h" 9 #include "chrome/browser/extensions/extension_apitest.h"
10 #include "chrome/browser/extensions/extension_browsertest.h" 10 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 content::Source<NavigationController>( 787 content::Source<NavigationController>(
788 &browser()->GetSelectedTabContentsWrapper()->controller())); 788 &browser()->GetSelectedTabContentsWrapper()->controller()));
789 browser()->Reload(CURRENT_TAB); 789 browser()->Reload(CURRENT_TAB);
790 observer.Wait(); 790 observer.Wait();
791 } 791 }
792 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( 792 ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
793 tab->render_view_host(), L"", L"testPluginWorks()", &result)); 793 tab->render_view_host(), L"", L"testPluginWorks()", &result));
794 EXPECT_TRUE(result); 794 EXPECT_TRUE(result);
795 } 795 }
796 796
797 #if !defined(USE_AURA) && (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CH ROMEOS)) 797 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
798 #define MAYBE_PluginPrivate PluginPrivate 798 #define MAYBE_PluginPrivate PluginPrivate
799 #else 799 #else
800 // TODO(mpcomplete): http://crbug.com/29900 need cross platform plugin support. 800 // TODO(mpcomplete): http://crbug.com/29900 need cross platform plugin support.
801 // crbug.com/105627 for AURA. 801 // crbug.com/105627 for chromeos.
802 #define MAYBE_PluginPrivate DISABLED_PluginPrivate 802 #define MAYBE_PluginPrivate DISABLED_PluginPrivate
803 #endif 803 #endif
804 804
805 // Tests that private extension plugins are only visible to the extension. 805 // Tests that private extension plugins are only visible to the extension.
806 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) { 806 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginPrivate) {
807 FilePath extension_dir = 807 FilePath extension_dir =
808 test_data_dir_.AppendASCII("uitest").AppendASCII("plugins_private"); 808 test_data_dir_.AppendASCII("uitest").AppendASCII("plugins_private");
809 809
810 ExtensionService* service = browser()->profile()->GetExtensionService(); 810 ExtensionService* service = browser()->profile()->GetExtensionService();
811 service->set_show_extensions_prompts(false); 811 service->set_show_extensions_prompts(false);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 874
875 EXPECT_EQ(extension->GetResourceURL("options.html"), 875 EXPECT_EQ(extension->GetResourceURL("options.html"),
876 tab_strip->GetTabContentsAt(1)->tab_contents()->GetURL()); 876 tab_strip->GetTabContentsAt(1)->tab_contents()->GetURL());
877 } 877 }
878 878
879 //============================================================================== 879 //==============================================================================
880 // STOP! Please do not add any more random-ass tests here. Create new files for 880 // STOP! Please do not add any more random-ass tests here. Create new files for
881 // your tests grouped by functionality. Also, you should strongly consider using 881 // your tests grouped by functionality. Also, you should strongly consider using
882 // ExtensionAPITest if possible. 882 // ExtensionAPITest if possible.
883 //============================================================================== 883 //==============================================================================
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698