13 files changed, 80 insertions, 50 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e050471..7710c8e 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -261,8 +261,8 @@
         'common/extensions/permissions/media_galleries_permission.h',
         'common/extensions/permissions/media_galleries_permission_data.cc',
         'common/extensions/permissions/media_galleries_permission_data.h',
-        'common/extensions/permissions/permission_message.cc',
-        'common/extensions/permissions/permission_message.h',
+        'common/extensions/permissions/permission_message_util.cc',
+        'common/extensions/permissions/permission_message_util.h',
         'common/extensions/permissions/permission_set.cc',
         'common/extensions/permissions/permission_set.h',
         'common/extensions/permissions/permissions_data.cc',
diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h
index 31d07ac..6d7ddfd 100644
--- a/chrome/common/extensions/permissions/api_permission.h
+++ b/chrome/common/extensions/permissions/api_permission.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
 #include "base/values.h"
-#include "chrome/common/extensions/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message.h"
 
 namespace IPC {
 class Message;
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
index 8a9a572..a6ca771 100644
--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc
+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -8,10 +8,10 @@
 #include "chrome/common/extensions/permissions/api_permission_set.h"
 #include "chrome/common/extensions/permissions/bluetooth_permission.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
-#include "chrome/common/extensions/permissions/permission_message.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "chrome/common/extensions/permissions/socket_permission.h"
 #include "chrome/common/extensions/permissions/usb_device_permission.h"
+#include "extensions/common/permissions/permission_message.h"
 #include "grit/generated_resources.h"
 
 namespace extensions {
diff --git a/chrome/common/extensions/permissions/chrome_scheme_hosts.h b/chrome/common/extensions/permissions/chrome_scheme_hosts.h
index 3d8fb10..8d2a6dd 100644
--- a/chrome/common/extensions/permissions/chrome_scheme_hosts.h
+++ b/chrome/common/extensions/permissions/chrome_scheme_hosts.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_CHROME_SCHEME_HOSTS_H_
 #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_CHROME_SCHEME_HOSTS_H_
 
-#include "chrome/common/extensions/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message.h"
 
 // Chrome-specific special case handling for permissions on hosts in
 // the chrome:// scheme.
diff --git a/chrome/common/extensions/permissions/permission_message.cc b/chrome/common/extensions/permissions/permission_message_util.cc
index 006e91a..272ad49 100644
--- a/chrome/common/extensions/permissions/permission_message.cc
+++ b/chrome/common/extensions/permissions/permission_message_util.cc
@@ -1,49 +1,47 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/extensions/permissions/permission_message.h"
+#include "chrome/common/extensions/permissions/permission_message_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "extensions/common/permissions/permission_message.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace extensions {
-//
-// PermissionMessage
-//
+using extensions::PermissionMessage;
 
-// static
-PermissionMessage PermissionMessage::CreateFromHostList(
-    const std::set<std::string>& hosts) {
+namespace permission_message_util {
+
+PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) {
   std::vector<std::string> host_list(hosts.begin(), hosts.end());
   DCHECK(host_list.size());
-  ID message_id;
+  PermissionMessage::ID message_id;
   string16 message;
   string16 details;
 
   switch (host_list.size()) {
     case 1:
-      message_id = kHosts1;
+      message_id = PermissionMessage::kHosts1;
       message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_1_HOST,
                                            UTF8ToUTF16(host_list[0]));
       break;
     case 2:
-      message_id = kHosts2;
+      message_id = PermissionMessage::kHosts2;
       message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_2_HOSTS,
                                            UTF8ToUTF16(host_list[0]),
                                            UTF8ToUTF16(host_list[1]));
       break;
     case 3:
-      message_id = kHosts3;
+      message_id = PermissionMessage::kHosts3;
       message = l10n_util::GetStringFUTF16(IDS_EXTENSION_PROMPT_WARNING_3_HOSTS,
                                            UTF8ToUTF16(host_list[0]),
                                            UTF8ToUTF16(host_list[1]),
                                            UTF8ToUTF16(host_list[2]));
       break;
     default:
-      message_id = kHosts4OrMore;
+      message_id = PermissionMessage::kHosts4OrMore;
 
       const int kRetainedFilesMessageIDs[6] = {
           IDS_EXTENSION_PROMPT_WARNING_HOSTS_DEFAULT,
@@ -71,19 +69,4 @@ PermissionMessage PermissionMessage::CreateFromHostList(
   return PermissionMessage(message_id, message, details);
 }
 
-PermissionMessage::PermissionMessage(
-    PermissionMessage::ID id, const string16& message)
-  : id_(id),
-    message_(message) {
-}
-
-PermissionMessage::PermissionMessage(
-    PermissionMessage::ID id, const string16& message, const string16& details)
-  : id_(id),
-    message_(message),
-    details_(details) {
-}
-
-PermissionMessage::~PermissionMessage() {}
-
-}  // namespace extensions
+}  // namespace permission_message_util
diff --git a/chrome/common/extensions/permissions/permission_message_util.h b/chrome/common/extensions/permissions/permission_message_util.h
new file mode 100644
index 0000000..1ff5a5a
--- /dev/null
+++ b/chrome/common/extensions/permissions/permission_message_util.h
@@ -0,0 +1,24 @@
+// 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_PERMISSION_MESSAGE_UTIL_H_
+#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_
+
+#include <set>
+#include <string>
+
+namespace extensions {
+class PermissionMessage;
+}
+
+namespace permission_message_util {
+
+// Creates the corresponding permission message for a list of hosts.
+// The messages change depending on what hosts are present.
+extensions::PermissionMessage CreateFromHostList(
+    const std::set<std::string>& hosts);
+
+}  // namespace permission_message_util
+
+#endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index 455ddd3..75d145c 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -11,6 +11,7 @@
 #include "base/stl_util.h"
 #include "chrome/common/extensions/permissions/chrome_scheme_hosts.h"
 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
+#include "chrome/common/extensions/permissions/permission_message_util.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/url_pattern.h"
@@ -520,7 +521,7 @@ std::set<PermissionMessage> PermissionSet::GetHostPermissionMessages(
 
     std::set<std::string> hosts = GetDistinctHostsForDisplay();
     if (!hosts.empty())
-      messages.insert(PermissionMessage::CreateFromHostList(hosts));
+      messages.insert(permission_message_util::CreateFromHostList(hosts));
   }
   return messages;
 }
diff --git a/chrome/common/extensions/permissions/permission_set.h b/chrome/common/extensions/permissions/permission_set.h
index d2bdeded..f385aa6 100644
--- a/chrome/common/extensions/permissions/permission_set.h
+++ b/chrome/common/extensions/permissions/permission_set.h
@@ -16,8 +16,8 @@
 #include "base/strings/string16.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
-#include "chrome/common/extensions/permissions/permission_message.h"
 #include "extensions/common/manifest.h"
+#include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/url_pattern_set.h"
 
 namespace extensions {
diff --git a/chrome/common/extensions/permissions/permissions_data.h b/chrome/common/extensions/permissions/permissions_data.h
index 18e3787..8ca7e63 100644
--- a/chrome/common/extensions/permissions/permissions_data.h
+++ b/chrome/common/extensions/permissions/permissions_data.h
@@ -13,7 +13,7 @@
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
-#include "chrome/common/extensions/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message.h"
 
 class GURL;
 
diff --git a/chrome/common/extensions/permissions/permissions_info.h b/chrome/common/extensions/permissions/permissions_info.h
index 6261362..c459c2b 100644
--- a/chrome/common/extensions/permissions/permissions_info.h
+++ b/chrome/common/extensions/permissions/permissions_info.h
@@ -13,7 +13,7 @@
 #include "base/lazy_instance.h"
 #include "chrome/common/extensions/permissions/api_permission.h"
 #include "chrome/common/extensions/permissions/api_permission_set.h"
-#include "chrome/common/extensions/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message.h"
 #include "extensions/common/permissions/permissions_provider.h"
 
 namespace extensions {
diff --git a/extensions/common/permissions/permission_message.cc b/extensions/common/permissions/permission_message.cc
new file mode 100644
index 0000000..1b11a37
--- /dev/null
+++ b/extensions/common/permissions/permission_message.cc
@@ -0,0 +1,27 @@
+// 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.
+
+#include "extensions/common/permissions/permission_message.h"
+
+namespace extensions {
+//
+// PermissionMessage
+//
+
+PermissionMessage::PermissionMessage(
+    PermissionMessage::ID id, const string16& message)
+  : id_(id),
+    message_(message) {
+}
+
+PermissionMessage::PermissionMessage(
+    PermissionMessage::ID id, const string16& message, const string16& details)
+  : id_(id),
+    message_(message),
+    details_(details) {
+}
+
+PermissionMessage::~PermissionMessage() {}
+
+}  // namespace extensions
diff --git a/chrome/common/extensions/permissions/permission_message.h b/extensions/common/permissions/permission_message.h
index 8270d2d..19c5799 100644
--- a/chrome/common/extensions/permissions/permission_message.h
+++ b/extensions/common/permissions/permission_message.h
@@ -1,11 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_PERMISSION_MESSAGE_H_
-#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_H_
+#ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_H_
+#define EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_H_
 
-#include <set>
 #include <string>
 #include <vector>
 
@@ -80,12 +79,6 @@ class PermissionMessage {
   COMPILE_ASSERT(PermissionMessage::kNone > PermissionMessage::kUnknown,
                  kNone_not_greater_than_kUnknown);
 
-  // Creates the corresponding permission message for a list of hosts. This is
-  // simply a convenience method around the constructor, since the messages
-  // change depending on what hosts are present.
-  static PermissionMessage CreateFromHostList(
-      const std::set<std::string>& hosts);
-
   // Creates the corresponding permission message.
   PermissionMessage(ID id, const string16& message);
   PermissionMessage(ID id, const string16& message, const string16& details);
@@ -123,4 +116,4 @@ typedef std::vector<PermissionMessage> PermissionMessages;
 
 }  // namespace extensions
 
-#endif  // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_H_
+#endif  // EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_H_
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index ebcdbfa..b9e1f209 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -64,6 +64,8 @@
         'common/matcher/url_matcher_helpers.h',
         'common/one_shot_event.cc',
         'common/one_shot_event.h',
+        'common/permissions/permission_message.cc',
+        'common/permissions/permission_message.h',
         'common/permissions/permissions_provider.h',
         'common/stack_frame.cc',
         'common/stack_frame.h',