| Index: chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| index 152c5ca37741001cd5661a656009f050b53d9dbc..6e85f455616813f518490bd4dff5eabf91fcf9da 100644
|
| --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
|
| @@ -56,9 +56,9 @@ class MockSearchIPCRouterDelegate : public SearchIPCRouter::Delegate {
|
| MOCK_METHOD2(OnLogEvent, void(NTPLoggingEventType event,
|
| base::TimeDelta time));
|
| MOCK_METHOD2(OnLogMostVisitedImpression,
|
| - void(int position, const base::string16& provider));
|
| + void(int position, NTPLoggingTileSource tile_source));
|
| MOCK_METHOD2(OnLogMostVisitedNavigation,
|
| - void(int position, const base::string16& provider));
|
| + void(int position, NTPLoggingTileSource tile_source));
|
| MOCK_METHOD1(PasteIntoOmnibox, void(const base::string16&));
|
| MOCK_METHOD1(OnChromeIdentityCheck, void(const base::string16& identity));
|
| MOCK_METHOD0(OnHistorySyncCheck, void());
|
| @@ -309,14 +309,14 @@ TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedImpressionMsg) {
|
| SetupMockDelegateAndPolicy();
|
| MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
|
| EXPECT_CALL(*mock_delegate(),
|
| - OnLogMostVisitedImpression(3, base::ASCIIToUTF16("Server"))).Times(1);
|
| + OnLogMostVisitedImpression(3, NTP_TILE_SOURCE_SERVER)).Times(1);
|
| EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
|
| .WillOnce(testing::Return(true));
|
|
|
| content::WebContents* contents = web_contents();
|
| OnMessageReceived(ChromeViewHostMsg_LogMostVisitedImpression(
|
| contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), 3,
|
| - base::ASCIIToUTF16("Server")));
|
| + NTP_TILE_SOURCE_SERVER));
|
| }
|
|
|
| TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedNavigationMsg) {
|
| @@ -324,14 +324,14 @@ TEST_F(SearchIPCRouterTest, ProcessLogMostVisitedNavigationMsg) {
|
| SetupMockDelegateAndPolicy();
|
| MockSearchIPCRouterPolicy* policy = GetSearchIPCRouterPolicy();
|
| EXPECT_CALL(*mock_delegate(),
|
| - OnLogMostVisitedNavigation(3, base::ASCIIToUTF16("Server"))).Times(1);
|
| + OnLogMostVisitedNavigation(3, NTP_TILE_SOURCE_SERVER)).Times(1);
|
| EXPECT_CALL(*policy, ShouldProcessLogEvent()).Times(1)
|
| .WillOnce(testing::Return(true));
|
|
|
| content::WebContents* contents = web_contents();
|
| OnMessageReceived(ChromeViewHostMsg_LogMostVisitedNavigation(
|
| contents->GetRoutingID(), GetSearchIPCRouterSeqNo(), 3,
|
| - base::ASCIIToUTF16("Server")));
|
| + NTP_TILE_SOURCE_SERVER));
|
| }
|
|
|
| TEST_F(SearchIPCRouterTest, ProcessChromeIdentityCheckMsg) {
|
|
|