Expand usage of platform-apps flag and permission features.
Reapplication of http://codereview.chromium.org/9837045/.
BUG=119758
TEST=added
[email protected],[email protected]
Review URL: http://codereview.chromium.org/9839105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128838 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 0f2a93e..6cc6681e 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -8,9 +8,12 @@
#include "base/stringprintf.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/unpacked_installer.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
@@ -274,3 +277,60 @@
ExtensionBrowserTest::SetUpCommandLine(command_line);
test_data_dir_ = test_data_dir_.AppendASCII("api_test");
}
+
+PlatformAppApiTest::PlatformAppApiTest()
+ : previous_command_line_(CommandLine::NO_PROGRAM) {}
+
+PlatformAppApiTest::~PlatformAppApiTest() {}
+
+void PlatformAppApiTest::SetUpCommandLine(CommandLine* command_line) {
+ ExtensionApiTest::SetUpCommandLine(command_line);
+
+ // If someone is using this class, we're going to insist on management of the
+ // relevant flags. If these flags are already set, die.
+ DCHECK(!command_line->HasSwitch(switches::kEnablePlatformApps));
+ DCHECK(!command_line->HasSwitch(switches::kEnableExperimentalExtensionApis));
+
+ // Squirrel away for potential use in VerifyPermissions.
+ //
+ // TODO(miket): I _could_ just call VerifyPermissions here instead of
+ // requiring everyone who inherits from PlatformAppApiTest to explicitly call
+ // it within a test, but that feels overbearing.
+ previous_command_line_ = *command_line;
+
+ command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
+ command_line->AppendSwitch(switches::kEnablePlatformApps);
+}
+
+void PlatformAppApiTest::VerifyPermissions(const FilePath& extension_path) {
+#if defined(OS_WIN)
+ // See http://code.google.com/p/chromium/issues/detail?id=119758.
+ //
+ // TODO(miket): investigate why WaitForExtensionLoadError() doesn't receive
+ // the expected notification on XP/Vista, but succeeds on other platforms.
+#else
+ CommandLine old_command_line(*CommandLine::ForCurrentProcess());
+ ExtensionService* service = browser()->profile()->GetExtensionService();
+
+ // Neither experimental nor platform-app flag.
+ *CommandLine::ForCurrentProcess() = previous_command_line_;
+ extensions::UnpackedInstaller::Create(service)->Load(extension_path);
+ ASSERT_TRUE(WaitForExtensionLoadError());
+
+ // Only experimental flag.
+ *CommandLine::ForCurrentProcess() = previous_command_line_;
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnableExperimentalExtensionApis);
+ extensions::UnpackedInstaller::Create(service)->Load(extension_path);
+ ASSERT_TRUE(WaitForExtensionLoadError());
+
+ // Only platform-app flag.
+ *CommandLine::ForCurrentProcess() = previous_command_line_;
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kEnablePlatformApps);
+ extensions::UnpackedInstaller::Create(service)->Load(extension_path);
+ ASSERT_TRUE(WaitForExtensionLoadError());
+
+ *CommandLine::ForCurrentProcess() = old_command_line;
+#endif
+}
