Simplify the magic required to create IPC message headers a bit.

chrome_frame/test/automation_client_mock.cc

 // Copyright (c) 2010 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_frame/test/automation_client_mock.h"
 
 #include "base/callback.h"
 #include "net/base/net_errors.h"
 #include "chrome_frame/custom_sync_call_context.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 
@@ skipping 235 matching lines @@
   CreateTab();
   SetAutomationServerOk(1);
 
   EXPECT_CALL(mock_proxy_, server_version()).Times(testing::AnyNumber())
       .WillRepeatedly(Return(""));
 
   // We need some valid HWNDs, when responding to CreateExternalTab
   HWND h1 = ::GetDesktopWindow();
   HWND h2 = ::GetDesktopWindow();
   EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property(
-      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID),
+      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
       testing::NotNull(), _))
           .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99));
 
   EXPECT_CALL(mock_proxy_, CreateTabProxy(testing::Eq(tab_handle_)))
       .WillOnce(Return(tab_));
 
   EXPECT_CALL(cfd_, OnAutomationServerReady())
       .WillOnce(QUIT_LOOP(loop_));
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
@@ skipping 13 matching lines @@
 }
 
 TEST_F(CFACMockTest, MockedCreateTabFailed) {
   HWND null_wnd = NULL;
   SetAutomationServerOk(1);
 
   EXPECT_CALL(mock_proxy_, server_version()).Times(testing::AnyNumber())
       .WillRepeatedly(Return(""));
 
   EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property(
-      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID),
+      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
       testing::NotNull(), _))
           .Times(1).WillOnce(HandleCreateTab(tab_handle_, null_wnd, null_wnd,
                                              99));
 
   EXPECT_CALL(mock_proxy_, CreateTabProxy(_)).Times(0);
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   Set_CFD_LaunchFailed(AUTOMATION_CREATE_TAB_FAILED);
 
@@ skipping 42 matching lines @@
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> clp(new ChromeFrameLaunchParams(
       empty, empty, profile_path_, profile_path_.BaseName().value(), L"", L"",
       false, false, false));
   clp->set_launch_timeout(1);  // Unneeded timeout, but can't be 0.
   clp->set_version_check(false);
 
   HWND h1 = ::GetDesktopWindow();
   HWND h2 = ::GetDesktopWindow();
   EXPECT_CALL(proxy, SendAsAsync(testing::Property(
-    &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID),
+    &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
     testing::NotNull(), _)).Times(3)
         .WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99))
         .WillOnce(HandleCreateTab(tab_handle_ * 2, h1, h2, 100))
         .WillOnce(HandleCreateTab(tab_handle_ * 3, h1, h2, 101));
 
   SetAutomationServerOk(3);
 
   // First, try a single tab and make sure the notification find its way to the
   // Chrome Frame Delegate.
   StrictMock<MockCFDelegate> cfd1;
@@ skipping 59 matching lines @@
   CreateTab();
   SetAutomationServerOk(1);
 
   EXPECT_CALL(mock_proxy_, server_version()).Times(testing::AnyNumber())
       .WillRepeatedly(Return(""));
 
   // We need some valid HWNDs, when responding to CreateExternalTab
   HWND h1 = ::GetDesktopWindow();
   HWND h2 = ::GetDesktopWindow();
   EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property(
-      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab__ID),
+      &IPC::SyncMessage::type, AutomationMsg_CreateExternalTab::ID),
       testing::NotNull(), _))
           .Times(1).WillOnce(HandleCreateTab(tab_handle_, h1, h2, 99));
 
   EXPECT_CALL(mock_proxy_, CreateTabProxy(testing::Eq(tab_handle_)))
       .WillOnce(Return(tab_));
 
   EXPECT_CALL(cfd_, OnAutomationServerReady())
       .WillOnce(InitiateNavigation(client_.get(),
                                    std::string("http://www.nonexistent.com"),
                                    std::string(), false));
 
   EXPECT_CALL(mock_proxy_, SendAsAsync(testing::Property(
-      &IPC::SyncMessage::type, AutomationMsg_NavigateInExternalTab__ID),
+      &IPC::SyncMessage::type, AutomationMsg_NavigateInExternalTab::ID),
       testing::NotNull(), _))
           .Times(1).WillOnce(QUIT_LOOP(loop_));
 
   EXPECT_CALL(mock_proxy_, CancelAsync(_)).Times(testing::AnyNumber());
 
   EXPECT_CALL(mock_proxy_, Send(
-      testing::Property(&IPC::Message::type, AutomationMsg_TabReposition__ID)))
+      testing::Property(&IPC::Message::type, AutomationMsg_TabReposition::ID)))
           .Times(1)
           .WillOnce(Return(true));
 
   EXPECT_CALL(cfd_, GetBounds(_)).Times(1);
 
   // Here we go!
   GURL empty;
   scoped_refptr<ChromeFrameLaunchParams> launch_params(
       new ChromeFrameLaunchParams(
           GURL("http://www.nonexistent.com"), empty, profile_path_,
           profile_path_.BaseName().value(), L"", L"", false, false, false));
   launch_params->set_launch_timeout(timeout);
   launch_params->set_version_check(false);
   EXPECT_TRUE(client_->Initialize(&cfd_, launch_params));
   loop_.RunFor(10);
 
   EXPECT_CALL(mock_proxy_, ReleaseTabProxy(testing::Eq(tab_handle_))).Times(1);
   client_->Uninitialize();
 }