Only allow extension pages to be displayed in the sidebar to be consistent...

chrome/common/extensions/extension_manifests_unittest.cc

 // 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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
@@ skipping 270 matching lines @@
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   LoadAndExpectError("sidebar_no_permissions.json",
       errors::kSidebarExperimental);
 
   LoadAndExpectError("sidebar_icon_empty.json",
       errors::kInvalidSidebarDefaultIconPath);
   LoadAndExpectError("sidebar_icon_invalid_type.json",
       errors::kInvalidSidebarDefaultIconPath);
+  LoadAndExpectError("sidebar_page_empty.json",
+      errors::kInvalidSidebarDefaultPage);
+  LoadAndExpectError("sidebar_page_invalid_type.json",
+      errors::kInvalidSidebarDefaultPage);
   LoadAndExpectError("sidebar_title_invalid_type.json",
       errors::kInvalidSidebarDefaultTitle);
-  LoadAndExpectError("sidebar_url_invalid.json",
-      errors::kInvalidSidebarDefaultUrl);
-  LoadAndExpectError("sidebar_url_invalid_type.json",
-      errors::kInvalidSidebarDefaultUrl);
-  LoadAndExpectError("sidebar_url_no_permissions.json",
-      extension_manifest_errors::kCannotAccessPage);
 
   scoped_refptr<Extension> extension(LoadAndExpectSuccess("sidebar.json"));
   ASSERT_TRUE(extension->sidebar_defaults() != NULL);
   EXPECT_EQ(extension->sidebar_defaults()->default_title(),
             ASCIIToUTF16("Default title"));
   EXPECT_EQ(extension->sidebar_defaults()->default_icon_path(),
             "icon.png");
   EXPECT_EQ(extension->url().spec() + "sidebar.html",
-            extension->sidebar_defaults()->default_url().spec());
-
-  scoped_refptr<Extension> extension_external_url(
-      LoadAndExpectSuccess("sidebar_external_url.json"));
-  EXPECT_EQ("http://sidebar.url/sidebar.html",
-            extension_external_url->sidebar_defaults()->default_url().spec());
+            extension->sidebar_defaults()->default_page().spec());
 
   *CommandLine::ForCurrentProcess() = old_command_line;
 }
 
 TEST_F(ExtensionManifestTest, DisallowHybridApps) {
   LoadAndExpectError("disallow_hybrid_1.json",
                      errors::kHostedAppsCannotIncludeExtensionFeatures);
   LoadAndExpectError("disallow_hybrid_2.json",
                      errors::kHostedAppsCannotIncludeExtensionFeatures);
 }
@@ skipping 121 matching lines @@
                      extension_manifest_errors::kInvalidTtsVoicesGender);
 
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("tts_provider_valid.json"));
 
   ASSERT_EQ(1u, extension->tts_voices().size());
   EXPECT_EQ("name", extension->tts_voices()[0].voice_name);
   EXPECT_EQ("en-US", extension->tts_voices()[0].locale);
   EXPECT_EQ("female", extension->tts_voices()[0].gender);
 }