Extensions: Prepare switch to new permission message system

chrome/common/extensions/permissions/chrome_permission_message_provider.h

 // Copyright 2013 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_CHROME_PERMISSION_MESSAGE_PROVIDER_H_
 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_CHROME_PERMISSION_MESSAGE_PROVIDER_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 
 namespace extensions {
 
 // Tested in two places:
 // 1. chrome_permission_message_provider_unittest.cc, which is a regular unit
 //    test for this class
 // 2. chrome/browser/extensions/permission_messages_unittest.cc, which is an
 //    integration test that ensures messages are correctly generated for
 //    extensions created through the extension system.
 class ChromePermissionMessageProvider : public PermissionMessageProvider {
  public:
   ChromePermissionMessageProvider();
   ~ChromePermissionMessageProvider() override;
 
   // PermissionMessageProvider implementation.

[Yoyo Zhou, 2015/03/12 20:55:57]

Add some comments here about the legacy-ness of various methods here. If someone
wants to add some new code using permissions, how do they know what interface to
use, while we have both the old and new systems?

(Even though your next CL will probably be to switch to using the intermediate
state, it'll help to have documentation here.)

[Marc Treib, 2015/03/13 10:43:09]

There are already comments to that effect in permission_message_provider.h. I've
added a pointer to those and a short tl;dr here.

[Yoyo Zhou, 2015/03/13 18:08:13]

Ah, sorry; don't know how I missed that.

-  PermissionMessages GetPermissionMessages(
+  PermissionMessageStrings GetPermissionMessageStrings(
+      const PermissionSet* permissions,
+      Manifest::Type extension_type) const override;
+  PermissionMessageIDs GetLegacyPermissionMessageIDs(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
   CoalescedPermissionMessages GetCoalescedPermissionMessages(
       const PermissionIDSet& permissions) const override;
-  std::vector<base::string16> GetWarningMessages(
+  std::vector<base::string16> GetLegacyWarningMessages(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
-  std::vector<base::string16> GetWarningMessagesDetails(
+  std::vector<base::string16> GetLegacyWarningMessagesDetails(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
   bool IsPrivilegeIncrease(const PermissionSet* old_permissions,
                            const PermissionSet* new_permissions,
                            Manifest::Type extension_type) const override;
   PermissionIDSet GetAllPermissionIDs(
       const PermissionSet* permissions,
       Manifest::Type extension_type) const override;
 
  private:
+  // TODO(treib): Remove this once we've switched to the new system.
+  PermissionMessages GetPermissionMessages(const PermissionSet* permissions,
+                                           Manifest::Type extension_type) const;
+
   // Gets the permission messages for the API permissions. Also adds any
   // permission IDs from API Permissions to |permission_ids|.
   // TODO(sashab): Deprecate the |permissions| argument, and rename this to
   // AddAPIPermissions().
   std::set<PermissionMessage> GetAPIPermissionMessages(
       const PermissionSet* permissions,
       PermissionIDSet* permission_ids) const;
 
   // Gets the permission messages for the Manifest permissions. Also adds any
   // permission IDs from manifest Permissions to |permission_ids|.
@@ skipping 40 matching lines @@
       const PermissionSet* old_permissions,
       const PermissionSet* new_permissions,
       Manifest::Type extension_type) const;
 
   DISALLOW_COPY_AND_ASSIGN(ChromePermissionMessageProvider);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_CHROME_PERMISSION_MESSAGE_PROVIDER_H_