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

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

Issue 8725013: Improve ExtensionBrowserTest. Part of moving ExtensionService to use ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests 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
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 "chrome/browser/extensions/crx_installer.h" 5 #include "chrome/browser/extensions/crx_installer.h"
6 #include "chrome/browser/extensions/extension_browsertest.h" 6 #include "chrome/browser/extensions/extension_browsertest.h"
7 #include "chrome/browser/extensions/extension_install_ui.h" 7 #include "chrome/browser/extensions/extension_install_ui.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 }; 68 };
69 69
70 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) { 70 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, Whitelisting) {
71 #if !defined(OS_CHROMEOS) 71 #if !defined(OS_CHROMEOS)
72 // An extension with NPAPI should give a prompt. 72 // An extension with NPAPI should give a prompt.
73 EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx", 73 EXPECT_TRUE(DidWhitelistInstallPrompt("uitest/plugins.crx",
74 "hdgllgikmikobbofgnabhfimcfoopgnd")); 74 "hdgllgikmikobbofgnabhfimcfoopgnd"));
75 #endif // !defined(OS_CHROMEOS) 75 #endif // !defined(OS_CHROMEOS)
76 } 76 }
77 77
78 // crbug.com/105728: Fails because the CRX is invalid.
78 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, 79 IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest,
79 GalleryInstallGetsExperimental) { 80 FAILS_GalleryInstallGetsExperimental) {
80 InstallExtension(test_data_dir_.AppendASCII("experimental.crx"), 0); 81 ASSERT_FALSE(InstallExtension(
81 InstallExtensionFromWebstore( 82 test_data_dir_.AppendASCII("experimental.crx"), 0));
82 test_data_dir_.AppendASCII("experimental.crx"), 1); 83 ASSERT_TRUE(InstallExtensionFromWebstore(
84 test_data_dir_.AppendASCII("experimental.crx"), 1));
83 } 85 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/extensions/extension_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698