| Index: chrome/browser/extensions/tab_helper.cc
 | 
| diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
 | 
| index 75455a76820905a6bb87e4857ff65ac13f948876..5bc94afe0520ab2c193b417855d8b0ce3a3df568 100644
 | 
| --- a/chrome/browser/extensions/tab_helper.cc
 | 
| +++ b/chrome/browser/extensions/tab_helper.cc
 | 
| @@ -36,9 +36,9 @@
 | 
|  #include "chrome/browser/ui/web_applications/web_app_ui.h"
 | 
|  #include "chrome/browser/web_applications/web_app.h"
 | 
|  #include "chrome/common/chrome_switches.h"
 | 
| +#include "chrome/common/extensions/chrome_extension_messages.h"
 | 
|  #include "chrome/common/extensions/extension_constants.h"
 | 
|  #include "chrome/common/extensions/extension_icon_set.h"
 | 
| -#include "chrome/common/extensions/extension_messages.h"
 | 
|  #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 | 
|  #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
 | 
|  #include "chrome/common/render_messages.h"
 | 
| @@ -60,6 +60,7 @@
 | 
|  #include "extensions/browser/extension_registry.h"
 | 
|  #include "extensions/browser/extension_system.h"
 | 
|  #include "extensions/common/extension.h"
 | 
| +#include "extensions/common/extension_messages.h"
 | 
|  #include "extensions/common/extension_resource.h"
 | 
|  #include "extensions/common/extension_urls.h"
 | 
|  #include "extensions/common/feature_switch.h"
 | 
| @@ -386,7 +387,7 @@ void TabHelper::DidNavigateMainFrame(
 | 
|  bool TabHelper::OnMessageReceived(const IPC::Message& message) {
 | 
|    bool handled = true;
 | 
|    IPC_BEGIN_MESSAGE_MAP(TabHelper, message)
 | 
| -    IPC_MESSAGE_HANDLER(ExtensionHostMsg_DidGetApplicationInfo,
 | 
| +    IPC_MESSAGE_HANDLER(ChromeExtensionHostMsg_DidGetApplicationInfo,
 | 
|                          OnDidGetApplicationInfo)
 | 
|      IPC_MESSAGE_HANDLER(ExtensionHostMsg_InlineWebstoreInstall,
 | 
|                          OnInlineWebstoreInstall)
 | 
| @@ -719,7 +720,7 @@ WebContents* TabHelper::GetAssociatedWebContents() const {
 | 
|  }
 | 
|  
 | 
|  void TabHelper::GetApplicationInfo(int32 page_id) {
 | 
| -  Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
 | 
| +  Send(new ChromeExtensionMsg_GetApplicationInfo(routing_id(), page_id));
 | 
|  }
 | 
|  
 | 
|  void TabHelper::Observe(int type,
 | 
| 
 |