Extensions: Switch to new permission message system, part I

chrome/browser/extensions/permission_message_combinations_unittest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/permissions/permission_message_test_util.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/switches.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using testing::Contains;
-using testing::Eq;
-
 namespace extensions {
 
 // Tests that ChromePermissionMessageProvider produces the expected messages for
 // various combinations of app/extension permissions.
 class PermissionMessageCombinationsUnittest : public testing::Test {
  public:
   PermissionMessageCombinationsUnittest()
       : message_provider_(new ChromePermissionMessageProvider()) {}
   ~PermissionMessageCombinationsUnittest() override {}
 
@@ skipping 15 matching lines @@
         *base::test::ParseJson(json_manifest_with_double_quotes));
     // Add the app to any whitelists so we can test all permissions.
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kWhitelistedExtensionID, app_->id());
   }
 
   // Checks whether the currently installed app or extension produces the given
   // permission messages. Call this after installing an app with the expected
   // permission messages. The messages are tested for existence in any order.
   testing::AssertionResult CheckManifestProducesPermissions() {
-    return CheckManifestProducesPermissions(
-        std::vector<std::string>(), GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyNoPermissionMessages(app_->permissions_data());
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1) {
-    std::vector<std::string> expected_messages;
-    expected_messages.push_back(expected_message_1);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyOnePermissionMessage(app_->permissions_data(),
+                                      expected_message_1);
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
       const std::string& expected_message_2) {
-    std::vector<std::string> expected_messages;
-    expected_messages.push_back(expected_message_1);
-    expected_messages.push_back(expected_message_2);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyTwoPermissionMessages(app_->permissions_data(),
+                                       expected_message_1, expected_message_2,
+                                       false);
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
       const std::string& expected_message_2,
       const std::string& expected_message_3) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyPermissionMessages(app_->permissions_data(), expected_messages,
+                                    false);
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
       const std::string& expected_message_2,
       const std::string& expected_message_3,
       const std::string& expected_message_4) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
     expected_messages.push_back(expected_message_4);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyPermissionMessages(app_->permissions_data(), expected_messages,
+                                    false);
   }
   testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
       const std::string& expected_message_2,
       const std::string& expected_message_3,
       const std::string& expected_message_4,
       const std::string& expected_message_5) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
     expected_messages.push_back(expected_message_4);
     expected_messages.push_back(expected_message_5);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetPermissionMessages(),
-        GetCoalescedPermissionMessages(), "messages");
+    return VerifyPermissionMessages(app_->permissions_data(), expected_messages,
+                                    false);
   }
-
-  // Checks whether the currently installed app or extension produces the given
-  // host permission messages. Call this after installing an app with the
-  // expected permission messages. The messages are tested for existence in any
-  // order.
-  testing::AssertionResult CheckManifestProducesHostPermissions() {
-    return CheckManifestProducesPermissions(
-        std::vector<std::string>(), GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
+  testing::AssertionResult CheckManifestProducesPermissions(
+      const std::string& expected_message_1,
+      const std::vector<std::string>& expected_submessages_1) {
+    return VerifyOnePermissionMessageWithSubmessages(
+        app_->permissions_data(), expected_message_1, expected_submessages_1);
   }
-  testing::AssertionResult CheckManifestProducesHostPermissions(
-      const std::string& expected_message_1) {
-    std::vector<std::string> expected_messages;
-    expected_messages.push_back(expected_message_1);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
-  }
-  testing::AssertionResult CheckManifestProducesHostPermissions(
+  testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
-      const std::string& expected_message_2) {
+      const std::vector<std::string>& expected_submessages_1,
+      const std::string& expected_message_2,
+      const std::vector<std::string>& expected_submessages_2) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
+    std::vector<std::vector<std::string>> expected_submessages;
+    expected_submessages.push_back(expected_submessages_1);
+    expected_submessages.push_back(expected_submessages_2);
+    return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
+                                                   expected_messages,
+                                                   expected_submessages, false);
   }
-  testing::AssertionResult CheckManifestProducesHostPermissions(
+  testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
+      const std::vector<std::string>& expected_submessages_1,
       const std::string& expected_message_2,
-      const std::string& expected_message_3) {
+      const std::vector<std::string>& expected_submessages_2,
+      const std::string& expected_message_3,
+      const std::vector<std::string>& expected_submessages_3) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
+    std::vector<std::vector<std::string>> expected_submessages;
+    expected_submessages.push_back(expected_submessages_1);
+    expected_submessages.push_back(expected_submessages_2);
+    expected_submessages.push_back(expected_submessages_3);
+    return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
+                                                   expected_messages,
+                                                   expected_submessages, false);
   }
-  testing::AssertionResult CheckManifestProducesHostPermissions(
+  testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
+      const std::vector<std::string>& expected_submessages_1,
       const std::string& expected_message_2,
+      const std::vector<std::string>& expected_submessages_2,
       const std::string& expected_message_3,
-      const std::string& expected_message_4) {
+      const std::vector<std::string>& expected_submessages_3,
+      const std::string& expected_message_4,
+      const std::vector<std::string>& expected_submessages_4) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
     expected_messages.push_back(expected_message_4);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
+    std::vector<std::vector<std::string>> expected_submessages;
+    expected_submessages.push_back(expected_submessages_1);
+    expected_submessages.push_back(expected_submessages_2);
+    expected_submessages.push_back(expected_submessages_3);
+    expected_submessages.push_back(expected_submessages_4);
+    return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
+                                                   expected_messages,
+                                                   expected_submessages, false);
   }
-  testing::AssertionResult CheckManifestProducesHostPermissions(
+  testing::AssertionResult CheckManifestProducesPermissions(
       const std::string& expected_message_1,
+      const std::vector<std::string>& expected_submessages_1,
       const std::string& expected_message_2,
+      const std::vector<std::string>& expected_submessages_2,
       const std::string& expected_message_3,
+      const std::vector<std::string>& expected_submessages_3,
       const std::string& expected_message_4,
-      const std::string& expected_message_5) {
+      const std::vector<std::string>& expected_submessages_4,
+      const std::string& expected_message_5,
+      const std::vector<std::string>& expected_submessages_5) {
     std::vector<std::string> expected_messages;
     expected_messages.push_back(expected_message_1);
     expected_messages.push_back(expected_message_2);
     expected_messages.push_back(expected_message_3);
     expected_messages.push_back(expected_message_4);
     expected_messages.push_back(expected_message_5);
-    return CheckManifestProducesPermissions(
-        expected_messages, GetHostPermissionMessages(),
-        GetCoalescedHostPermissionMessages(), "host messages");
+    std::vector<std::vector<std::string>> expected_submessages;
+    expected_submessages.push_back(expected_submessages_1);
+    expected_submessages.push_back(expected_submessages_2);
+    expected_submessages.push_back(expected_submessages_3);
+    expected_submessages.push_back(expected_submessages_4);
+    expected_submessages.push_back(expected_submessages_5);
+    return VerifyPermissionMessagesWithSubmessages(app_->permissions_data(),
+                                                   expected_messages,
+                                                   expected_submessages, false);
   }
 
  private:
-  std::vector<base::string16> GetPermissionMessages() {
-    return app_->permissions_data()->GetPermissionMessageStrings();
-  }
-
-  std::vector<base::string16> GetCoalescedPermissionMessages() {
-    CoalescedPermissionMessages messages =
-        app_->permissions_data()->GetCoalescedPermissionMessages();
-    std::vector<base::string16> message_strings;
-    for (const auto& message : messages) {
-      message_strings.push_back(message.message());
-    }
-    return message_strings;
-  }
-
-  std::vector<base::string16> GetHostPermissionMessages() {
-    std::vector<base::string16> details =
-        app_->permissions_data()->GetPermissionMessageDetailsStrings();
-    // If we have a host permission, exactly one message will contain the
-    // details for it.
-    for (const auto& host_string : details) {
-      if (!host_string.empty()) {
-        // The host_string will be a newline-separated string of entries.
-        std::vector<base::string16> pieces;
-        base::SplitString(host_string, base::char16('\n'), &pieces);
-        return pieces;
-      }
-    }
-    return std::vector<base::string16>();
-  }
-
-  std::vector<base::string16> GetCoalescedHostPermissionMessages() {
-    // If we have a host permission, exactly one message will contain the
-    // details for it.
-    CoalescedPermissionMessages messages =
-        app_->permissions_data()->GetCoalescedPermissionMessages();
-    for (const auto& message : messages) {
-      if (!message.submessages().empty())
-        return message.submessages();
-    }
-    return std::vector<base::string16>();
-  }
-
-  // TODO(sashab): Remove the legacy messages from this function once the legacy
-  // messages system is no longer used.
-  testing::AssertionResult CheckManifestProducesPermissions(
-      const std::vector<std::string>& expected_messages,
-      const std::vector<base::string16>& actual_legacy_messages,
-      const std::vector<base::string16>& actual_messages,
-      const std::string& message_type_name) {
-    // Check the new messages system matches the legacy one.
-    if (actual_legacy_messages.size() != actual_messages.size()) {
-      // Message: Got 2 messages in the legacy system { "Bar", "Baz" }, but 0 in
-      // the new system {}
-      return testing::AssertionFailure()
-             << "Got " << actual_legacy_messages.size() << " "
-             << message_type_name << " in the legacy system "
-             << MessagesVectorToString(actual_legacy_messages) << ", but "
-             << actual_messages.size() << " in the new system "
-             << MessagesVectorToString(actual_messages);
-    }
-
-    for (const auto& actual_message : actual_messages) {
-      if (std::find(actual_legacy_messages.begin(),
-                    actual_legacy_messages.end(),
-                    actual_message) == actual_legacy_messages.end()) {
-        // Message: Got { "Foo" } in the legacy messages system, but { "Bar",
-        // "Baz" } in the new system
-        return testing::AssertionFailure()
-               << "Got " << MessagesVectorToString(actual_legacy_messages)
-               << " in the legacy " << message_type_name << " system, but "
-               << MessagesVectorToString(actual_messages)
-               << " in the new system";
-      }
-    }
-
-    // Check the non-legacy & actual messages are equal.
-    if (expected_messages.size() != actual_messages.size()) {
-      // Message: Expected 7 messages, got 5
-      return testing::AssertionFailure()
-             << "Expected " << expected_messages.size() << " "
-             << message_type_name << ", got " << actual_messages.size() << ": "
-             << MessagesVectorToString(actual_messages);
-    }
-
-    for (const auto& expected_message : expected_messages) {
-      if (std::find(actual_messages.begin(), actual_messages.end(),
-                    base::ASCIIToUTF16(expected_message)) ==
-          actual_messages.end()) {
-        // Message: Expected messages to contain "Foo", got { "Bar", "Baz" }
-        return testing::AssertionFailure()
-               << "Expected " << message_type_name << " to contain \""
-               << expected_message << "\", got "
-               << MessagesVectorToString(actual_messages);
-      }
-    }
-
-    return testing::AssertionSuccess();
-  }
-
-  // Returns the vector of messages in a human-readable string format, e.g.:
-  // { "Bar", "Baz" }
-  base::string16 MessagesVectorToString(
-      const std::vector<base::string16>& messages) {
-    if (messages.empty())
-      return base::ASCIIToUTF16("{}");
-    return base::ASCIIToUTF16("{ \"") +
-           JoinString(messages, base::ASCIIToUTF16("\", \"")) +
-           base::ASCIIToUTF16("\" }");
-  }
-
   extensions::TestExtensionEnvironment env_;
   scoped_ptr<ChromePermissionMessageProvider> message_provider_;
   scoped_refptr<const Extension> app_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMessageCombinationsUnittest);
 };
 
 // Test that the USB, Bluetooth and Serial permissions do not coalesce on their
 // own, but do coalesce when more than 1 is present.
 TEST_F(PermissionMessageCombinationsUnittest, USBSerialBluetoothCoalescing) {
   // Test that the USB permission does not coalesce on its own.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the serial permission does not coalesce on its own.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'serial'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions("Access your serial devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the bluetooth permission does not coalesce on its own.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'bluetooth': {}"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access information about Bluetooth devices paired with your system and "
       "discover nearby Bluetooth devices."));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the bluetooth permission does not coalesce on its own, even
   // when it specifies additional permissions.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'bluetooth': {"
       "    'uuids': ['1105', '1106']"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access information about Bluetooth devices paired with your system and "
       "discover nearby Bluetooth devices."));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the USB and Serial permissions coalesce.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] },"
       "    'serial'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor",
       "Access your serial devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the USB, Serial and Bluetooth permissions coalesce.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] },"
       "    'serial'"
       "  ],"
       "  'bluetooth': {}"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor",
       "Access your Bluetooth and Serial devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Test that the USB, Serial and Bluetooth permissions coalesce even when
   // Bluetooth specifies multiple additional permissions.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': [{ 'vendorId': 123, 'productId': 456 }] },"
       "    'serial'"
       "  ],"
       "  'bluetooth': {"
       "    'uuids': ['1105', '1106'],"
       "    'socket': true,"
       "    'low_energy': true"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor",
       "Access your Bluetooth and Serial devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Test that the History permission takes precedence over the Tabs permission,
 // and that the Sessions permission modifies this final message.
 TEST_F(PermissionMessageCombinationsUnittest, TabsHistorySessionsCoalescing) {
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions("Read your browsing history"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs', 'sessions'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read your browsing history on all your signed-in devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs', 'history'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your browsing history"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs', 'history', 'sessions'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your browsing history on all your signed-in devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Test that the fileSystem permission produces no messages by itself, unless it
 // has both the 'write' and 'directory' additional permissions, in which case it
 // displays a message.
 TEST_F(PermissionMessageCombinationsUnittest, FileSystemReadWriteCoalescing) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'fileSystem'"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'fileSystem', {'fileSystem': ['retainEntries', 'write']}"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'fileSystem', {'fileSystem': ["
       "      'retainEntries', 'write', 'directory'"
       "    ]}"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Write to files and folders that you open in the application"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Check that host permission messages are generated correctly when URLs are
 // entered as permissions.
 TEST_F(PermissionMessageCombinationsUnittest, HostsPermissionMessages) {
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on www.blogger.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://*.google.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all google.com sites"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all google.com sites and "
       "www.blogger.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'http://*.news.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all google.com sites, all news.com sites, "
       "and www.blogger.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'http://*.news.com/',"
       "    'http://www.foobar.com/',"
       "  ]"
       "}");
+  std::vector<std::string> submessages;
+  submessages.push_back("All google.com sites");
+  submessages.push_back("All news.com sites");
+  submessages.push_back("www.blogger.com");
+  submessages.push_back("www.foobar.com");
   ASSERT_TRUE(CheckManifestProducesPermissions(
-      "Read and change your data on a number of websites"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions(
-      "All google.com sites", "All news.com sites", "www.blogger.com",
-      "www.foobar.com"));
+      "Read and change your data on a number of websites", submessages));
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'http://*.news.com/',"
       "    'http://www.foobar.com/',"
       "    'http://*.go.com/',"
       "  ]"
       "}");
+  submessages.clear();
+  submessages.push_back("All go.com sites");
+  submessages.push_back("All google.com sites");
+  submessages.push_back("All news.com sites");
+  submessages.push_back("www.blogger.com");
+  submessages.push_back("www.foobar.com");
   ASSERT_TRUE(CheckManifestProducesPermissions(
-      "Read and change your data on a number of websites"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions(
-      "All go.com sites", "All google.com sites", "All news.com sites",
-      "www.blogger.com", "www.foobar.com"));
+      "Read and change your data on a number of websites", submessages));
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://*.go.com/',"
       "    'chrome://favicon/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all go.com sites",
       "Read the icons of the websites you visit"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Having the 'all sites' permission doesn't change the permission message,
   // since its pseudo-granted at runtime.
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'http://*.go.com/',"
       "    'chrome://favicon/',"
       "    'http://*.*',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all go.com sites",
       "Read the icons of the websites you visit"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Check that permission messages are generated correctly for
 // SocketsManifestPermission, which has host-like permission messages.
 TEST_F(PermissionMessageCombinationsUnittest,
        SocketsManifestPermissionMessages) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'udp': {'send': '*'},"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'udp': {'send': ':99'},"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcp': {'connect': '127.0.0.1:80'},"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computer named 127.0.0.1"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcp': {'connect': 'www.example.com:23'},"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computer named www.example.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcpServer': {'listen': '127.0.0.1:80'}"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computer named 127.0.0.1"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcpServer': {'listen': ':8080'}"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcpServer': {"
       "      'listen': ["
       "        '127.0.0.1:80',"
       "        'www.google.com',"
       "        'www.example.com:*',"
       "        'www.foo.com:200',"
       "        'www.bar.com:200'"
       "      ]"
       "    }"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computers named: 127.0.0.1 www.bar.com "
       "www.example.com www.foo.com www.google.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcp': {"
@@ skipping 12 matching lines @@
       "        'www.example.com:*',"
       "        'www.foo.com:200',"
       "      ]"
       "    }"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computers named: 127.0.0.1 www.abc.com "
       "www.example.com www.foo.com www.freestuff.com www.google.com "
       "www.mywebsite.com www.test.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'sockets': {"
       "    'tcp': {'send': '*:*'},"
       "    'tcpServer': {'listen': '*:*'},"
       "  }"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Check that permission messages are generated correctly for
 // MediaGalleriesPermission (an API permission with custom messages).
 TEST_F(PermissionMessageCombinationsUnittest,
        MediaGalleriesPermissionMessages) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'mediaGalleries': ['read'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'mediaGalleries': ['read', 'allAutoDetected'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access photos, music, and other media from your computer"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // TODO(sashab): Add a test for the
   // IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_WRITE message (generated
   // with the 'read' and 'copyTo' permissions, but not the 'delete' permission),
   // if it's possible to get this message. Otherwise, remove it from the code.
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'mediaGalleries': ['read', 'delete', 'allAutoDetected'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and delete photos, music, and other media from your computer"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'mediaGalleries':"
       "      [ 'read', 'delete', 'copyTo', 'allAutoDetected' ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read, change and delete photos, music, and other media from your "
       "computer"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   // Without the allAutoDetected permission, there should be no install-time
   // permission messages.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'mediaGalleries': ['read', 'delete', 'copyTo'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // TODO(sashab): Add tests for SettingsOverrideAPIPermission (an API permission
 // with custom messages).
 
 // Check that permission messages are generated correctly for SocketPermission
 // (an API permission with custom messages).
 TEST_F(PermissionMessageCombinationsUnittest, SocketPermissionMessages) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ['tcp-connect:*:*'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ["
       "      'tcp-connect:*:443',"
       "      'tcp-connect:*:50032',"
       "      'tcp-connect:*:23',"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ['tcp-connect:foo.example.com:443'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computer named foo.example.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ['tcp-connect:foo.example.com:443', 'udp-send-to'] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ["
       "      'tcp-connect:foo.example.com:443',"
       "      'udp-send-to:test.ping.com:50032',"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computers named: foo.example.com test.ping.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ["
       "      'tcp-connect:foo.example.com:443',"
       "      'udp-send-to:test.ping.com:50032',"
       "      'udp-send-to:www.ping.com:50032',"
       "      'udp-send-to:test2.ping.com:50032',"
       "      'udp-bind:test.ping.com:50032',"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with the computers named: foo.example.com test.ping.com "
       "test2.ping.com www.ping.com"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'socket': ["
       "      'tcp-connect:foo.example.com:443',"
       "      'udp-send-to:test.ping.com:50032',"
       "      'tcp-connect:*:23',"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Exchange data with any computer on the local network or internet"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Check that permission messages are generated correctly for
 // USBDevicePermission (an API permission with custom messages).
 TEST_F(PermissionMessageCombinationsUnittest, USBDevicePermissionMessages) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': ["
       "      { 'vendorId': 0, 'productId': 0 },"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from an unknown vendor"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': ["
       "      { 'vendorId': 4179, 'productId': 529 },"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access USB devices from Immanuel Electronics Co., Ltd"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': ["
       "      { 'vendorId': 6353, 'productId': 8192 },"
       "    ] }"
       "  ]"
       "}");
   ASSERT_TRUE(
       CheckManifestProducesPermissions("Access USB devices from Google Inc."));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    { 'usbDevices': ["
       "      { 'vendorId': 4179, 'productId': 529 },"
       "      { 'vendorId': 6353, 'productId': 8192 },"
       "    ] }"
       "  ]"
       "}");
-  ASSERT_TRUE(
-      CheckManifestProducesPermissions("Access any of these USB devices"));
-
-  // Although technically not host permissions, devices are currently stored in
-  // the 'host permissions' (details list) for the USB permission, in the same
-  // format.
-  // TODO(sashab): Rename host permissions to 'details list' or 'nested
-  // permissions', and change this test system to allow specifying each message
-  // as well as its corresponding nested messages, if any. Also add a test that
-  // uses this to test an app with multiple nested permission lists (e.g. both
-  // USB and host permissions).
-  ASSERT_TRUE(CheckManifestProducesHostPermissions(
-      "unknown devices from Immanuel Electronics Co., Ltd",
-      "unknown devices from Google Inc."));
+  std::vector<std::string> submessages;
+  submessages.push_back("unknown devices from Immanuel Electronics Co., Ltd");
+  submessages.push_back("unknown devices from Google Inc.");
+  ASSERT_TRUE(CheckManifestProducesPermissions(
+      "Access any of these USB devices", submessages));
 
   // TODO(sashab): Add a test with a valid product/vendor USB device.
 }
 
 // Test that hosted apps are not given any messages for host permissions.
 TEST_F(PermissionMessageCombinationsUnittest,
        PackagedAppsHaveNoHostPermissions) {
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'permissions': ["
       "    'serial',"
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions("Access your serial devices"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Test various apps with lots of permissions, including those with no
 // permission messages, or those that only apply to apps or extensions even when
 // the given manifest is for a different type.
 TEST_F(PermissionMessageCombinationsUnittest, PermissionMessageCombos) {
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs',"
       "    'bookmarks',"
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'unlimitedStorage',"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change your data on all google.com sites and www.blogger.com",
       "Read your browsing history", "Read and change your bookmarks"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs',"
       "    'sessions',"
       "    'bookmarks',"
       "    'unlimitedStorage',"
       "    'syncFileSystem',"
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'http://*.news.com/',"
       "    'http://www.foobar.com/',"
       "    'http://*.go.com/',"
       "  ]"
       "}");
+  std::vector<std::string> submessages;
+  submessages.push_back("All go.com sites");
+  submessages.push_back("All google.com sites");
+  submessages.push_back("All news.com sites");
+  submessages.push_back("www.blogger.com");
+  submessages.push_back("www.foobar.com");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read your browsing history on all your signed-in devices",
-      "Read and change your bookmarks",
-      "Read and change your data on a number of websites"));
-  ASSERT_TRUE(CheckManifestProducesHostPermissions(
-      "All go.com sites", "All google.com sites", "All news.com sites",
-      "www.blogger.com", "www.foobar.com"));
+      std::vector<std::string>(), "Read and change your bookmarks",
+      std::vector<std::string>(),
+      "Read and change your data on a number of websites", submessages));
 
   CreateAndInstall(
       "{"
       "  'permissions': ["
       "    'tabs',"
       "    'sessions',"
       "    'bookmarks',"
       "    'accessibilityFeatures.read',"
       "    'accessibilityFeatures.modify',"
       "    'alarms',"
       "    'browsingData',"
       "    'cookies',"
       "    'desktopCapture',"
       "    'gcm',"
       "    'topSites',"
       "    'storage',"
       "    'unlimitedStorage',"
       "    'syncFileSystem',"
       "    'http://www.blogger.com/',"
       "    'http://*.google.com/',"
       "    'http://*.news.com/',"
       "    'http://www.foobar.com/',"
       "    'http://*.go.com/',"
       "  ]"
       "}");
 
+  submessages.clear();
+  submessages.push_back("All go.com sites");
+  submessages.push_back("All google.com sites");
+  submessages.push_back("All news.com sites");
+  submessages.push_back("www.blogger.com");
+  submessages.push_back("www.foobar.com");
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read your browsing history on all your signed-in devices",
-      "Capture content of your screen", "Read and change your bookmarks",
-      "Read and change your data on a number of websites",
-      "Read and change your accessibility settings"));
-
-  ASSERT_TRUE(CheckManifestProducesHostPermissions(
-      "All go.com sites", "All google.com sites", "All news.com sites",
-      "www.blogger.com", "www.foobar.com"));
+      std::vector<std::string>(), "Capture content of your screen",
+      std::vector<std::string>(), "Read and change your bookmarks",
+      std::vector<std::string>(),
+      "Read and change your data on a number of websites", submessages,
+      "Read and change your accessibility settings",
+      std::vector<std::string>()));
 
   // Create an App instead, ensuring that the host permission messages are not
   // added.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
@@ skipping 18 matching lines @@
       "    'http://*.news.com/',"
       "    'http://www.foobar.com/',"
       "    'http://*.go.com/',"
       "  ]"
       "}");
 
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Access your serial devices", "Store data in your Google Drive account",
       "Read and change your accessibility settings"));
 
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // Tests that the 'plugin' manifest key produces the correct permission.
 TEST_F(PermissionMessageCombinationsUnittest, PluginPermission) {
   // Extensions can have plugins.
   CreateAndInstall(
       "{"
       "  'plugins': ["
       "    { 'path': 'extension_plugin.dll' }"
       "  ]"
       "}");
 
 #ifdef OS_CHROMEOS
   ASSERT_TRUE(CheckManifestProducesPermissions());
 #else
   ASSERT_TRUE(CheckManifestProducesPermissions(
       "Read and change all your data on your computer and the websites you "
       "visit"));
 #endif
 
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
-
   // Apps can't have plugins.
   CreateAndInstall(
       "{"
       "  'app': {"
       "    'background': {"
       "      'scripts': ['background.js']"
       "    }"
       "  },"
       "  'plugins': ["
       "    { 'path': 'extension_plugin.dll' }"
       "  ]"
       "}");
   ASSERT_TRUE(CheckManifestProducesPermissions());
-  ASSERT_TRUE(CheckManifestProducesHostPermissions());
 }
 
 // TODO(sashab): Add a test that checks that messages are generated correctly
 // for withheld permissions, when an app is granted the 'all sites' permission.
 
 // TODO(sashab): Add a test that ensures that all permissions that can generate
 // a coalesced message can also generate a message on their own (i.e. ensure
 // that no permissions only modify other permissions).
 
 // TODO(sashab): Add a test for every permission message combination that can
 // generate a message.
 
 // TODO(aboxhall): Add tests for the automation API permission messages.
 
 }  // namespace extensions