Caused compile failure on Lunux Builder x64.

Revert 81438 - apps: Add 'background_page' support for hosted apps.A hosted app can have a 'background_page' if it has 'background' 'permission'.The 'background_page' will launch immediately after the app is installed.BUG=77718TEST=AppBackgroundPageApiTest.ManifestBackgroundPage, and existing tests.Review URL: http://codereview.chromium.org/6708100
TBR=sadrul@chromium.org
Review URL: http://codereview.chromium.org/6834035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81442 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 38 deletions

diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index b13dc77..f1f98bf 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -1,15 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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/background_contents_service.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
@@ -18,7 +13,6 @@ class AppBackgroundPageApiTest : public ExtensionApiTest {
   void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kDisablePopupBlocking);
-    command_line->AppendSwitch(switches::kAllowHTTPBackgroundPage);
   }
 
   bool CreateApp(const std::string& app_manifest,
@@ -96,34 +90,3 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_LacksPermission) {
   ASSERT_TRUE(RunExtensionTest("app_background_page/lacks_permission"))
       << message_;
 }
-
-IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, ManifestBackgroundPage) {
-  host_resolver()->AddRule("a.com", "127.0.0.1");
-  ASSERT_TRUE(StartTestServer());
-
-  std::string app_manifest = StringPrintf(
-      "{"
-      "  \"name\": \"App\","
-      "  \"version\": \"0.1\","
-      "  \"app\": {"
-      "    \"urls\": ["
-      "      \"http://a.com/\""
-      "    ],"
-      "    \"launch\": {"
-      "      \"web_url\": \"http://a.com:%d/\""
-      "    }"
-      "  },"
-      "  \"permissions\": [\"background\"],"
-      "  \"background_page\": \"http://a.com:%d/test.html\""
-      "}",
-      test_server()->host_port_pair().port(),
-      test_server()->host_port_pair().port());
-
-  FilePath app_dir;
-  ASSERT_TRUE(CreateApp(app_manifest, &app_dir));
-  ASSERT_TRUE(LoadExtension(app_dir));
-
-  const Extension* extension = GetSingleLoadedExtension();
-  ASSERT_TRUE(browser()->profile()->GetBackgroundContentsService()->
-                  GetAppBackgroundContents(ASCIIToUTF16(extension->id())));
-}