JSON/IDL Compiler now generates event names as of r215660. Use these generated event names instead of custom constant strings.

BUG=268380

Review URL: https://chromiumcodereview.appspot.com/23013006

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

3 files changed, 9 insertions, 6 deletions

diff --git a/chrome/browser/extensions/api/idle/idle_api_constants.cc b/chrome/browser/extensions/api/idle/idle_api_constants.cc
index 15d6325..84d42e0 100644
--- a/chrome/browser/extensions/api/idle/idle_api_constants.cc
+++ b/chrome/browser/extensions/api/idle/idle_api_constants.cc
@@ -8,8 +8,6 @@ namespace extensions {
 
 namespace idle_api_constants {
 
-const char kOnStateChanged[] = "idle.onStateChanged";
-
 const char kStateActive[] = "active";
 const char kStateIdle[] = "idle";
 const char kStateLocked[] = "locked";
diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
index bbffd00..cf6ee66 100644
--- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc
+++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
+#include "chrome/common/extensions/api/idle.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ -25,6 +26,7 @@
 using ::testing::_;
 
 namespace utils = extension_function_test_utils;
+namespace idle = extensions::api::idle;
 
 namespace extensions {
 
@@ -107,13 +109,13 @@ ScopedListen::ScopedListen(IdleManager* idle_manager,
                            const std::string& extension_id)
     : idle_manager_(idle_manager),
       extension_id_(extension_id) {
-  const EventListenerInfo details(idle_api_constants::kOnStateChanged,
+  const EventListenerInfo details(idle::OnStateChanged::kEventName,
                                   extension_id_);
   idle_manager_->OnListenerAdded(details);
 }
 
 ScopedListen::~ScopedListen() {
-  const EventListenerInfo details(idle_api_constants::kOnStateChanged,
+  const EventListenerInfo details(idle::OnStateChanged::kEventName,
                                   extension_id_);
   idle_manager_->OnListenerRemoved(details);
 }
diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc
index 8b66e86..48785c7 100644
--- a/chrome/browser/extensions/api/idle/idle_manager.cc
+++ b/chrome/browser/extensions/api/idle/idle_manager.cc
@@ -12,12 +12,14 @@
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/api/idle.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 namespace keys = extensions::idle_api_constants;
+namespace idle = extensions::api::idle;
 
 namespace extensions {
 
@@ -51,7 +53,8 @@ void DefaultEventDelegate::OnStateChanged(const std::string& extension_id,
                                           IdleState new_state) {
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(IdleManager::CreateIdleValue(new_state));
-  scoped_ptr<Event> event(new Event(keys::kOnStateChanged, args.Pass()));
+  scoped_ptr<Event> event(new Event(idle::OnStateChanged::kEventName,
+                                    args.Pass()));
   event->restrict_to_profile = profile_;
   ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
       extension_id, event.Pass());
@@ -60,7 +63,7 @@ void DefaultEventDelegate::OnStateChanged(const std::string& extension_id,
 void DefaultEventDelegate::RegisterObserver(
     EventRouter::Observer* observer) {
   ExtensionSystem::Get(profile_)->event_router()->RegisterObserver(
-      observer, idle_api_constants::kOnStateChanged);
+      observer, idle::OnStateChanged::kEventName);
 }
 
 void DefaultEventDelegate::UnregisterObserver(EventRouter::Observer* observer) {