AppBackgroundPageApiTest works with testserver on ephemeral ports.
BUG=56814,53632
TEST=browser_tests --gtest_filter="*AppBackgroundPageApiTest*"
Review URL: http://codereview.chromium.org/4074001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63642 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index d1e78d1..80d22184 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/string_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/common/chrome_switches.h"
@@ -14,14 +15,53 @@
ExtensionApiTest::SetUpCommandLine(command_line);
command_line->AppendSwitch(switches::kDisablePopupBlocking);
}
+
+ bool CreateApp(const std::string& app_manifest,
+ FilePath* app_dir) {
+ if (!app_dir_.CreateUniqueTempDir()) {
+ LOG(ERROR) << "Unable to create a temporary directory.";
+ return false;
+ }
+ FilePath manifest_path = app_dir_.path().AppendASCII("manifest.json");
+ int bytes_written = file_util::WriteFile(manifest_path,
+ app_manifest.data(),
+ app_manifest.size());
+ if (bytes_written != static_cast<int>(app_manifest.size())) {
+ LOG(ERROR) << "Unable to write complete manifest to file. Return code="
+ << bytes_written;
+ return false;
+ }
+ *app_dir = app_dir_.path();
+ return true;
+ }
+
+ private:
+ ScopedTempDir app_dir_;
};
IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) {
host_resolver()->AddRule("a.com", "127.0.0.1");
ASSERT_TRUE(StartTestServer());
- LoadExtension(test_data_dir_.AppendASCII(
- "app_background_page/app_has_permission"));
+ std::string app_manifest = StringPrintf(
+ "{"
+ " \"name\": \"App\","
+ " \"version\": \"0.1\","
+ " \"app\": {"
+ " \"urls\": ["
+ " \"http://a.com/\""
+ " ],"
+ " \"launch\": {"
+ " \"web_url\": \"http://a.com:%d/\""
+ " }"
+ " },"
+ " \"permissions\": [\"background\"]"
+ "}",
+ test_server()->host_port_pair().port());
+
+ FilePath app_dir;
+ ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
+ ASSERT_TRUE(LoadExtension(app_dir));
ASSERT_TRUE(RunExtensionTest("app_background_page/basic")) << message_;
}
@@ -29,8 +69,24 @@
host_resolver()->AddRule("a.com", "127.0.0.1");
ASSERT_TRUE(StartTestServer());
- LoadExtension(test_data_dir_.AppendASCII(
- "app_background_page/app_lacks_permission"));
+ std::string app_manifest = StringPrintf(
+ "{"
+ " \"name\": \"App\","
+ " \"version\": \"0.1\","
+ " \"app\": {"
+ " \"urls\": ["
+ " \"http://a.com/\""
+ " ],"
+ " \"launch\": {"
+ " \"web_url\": \"http://a.com:%d/\""
+ " }"
+ " }"
+ "}",
+ test_server()->host_port_pair().port());
+
+ FilePath app_dir;
+ ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
+ ASSERT_TRUE(LoadExtension(app_dir));
ASSERT_TRUE(RunExtensionTest("app_background_page/lacks_permission"))
<< message_;
}
