Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Side by Side Diff: chrome/browser/ui/search/search_tab_helper_unittest.cc

Issue 1006753003: Add time from navigation_start to NTP LogEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/search/search_tab_helper.h" 5 #include "chrome/browser/ui/search/search_tab_helper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/time/time.h"
11 #include "chrome/browser/prerender/prerender_manager.h" 12 #include "chrome/browser/prerender/prerender_manager.h"
12 #include "chrome/browser/prerender/prerender_manager_factory.h" 13 #include "chrome/browser/prerender/prerender_manager_factory.h"
13 #include "chrome/browser/search/instant_unittest_base.h" 14 #include "chrome/browser/search/instant_unittest_base.h"
14 #include "chrome/browser/search/search.h" 15 #include "chrome/browser/search/search.h"
15 #include "chrome/browser/search_engines/template_url_service_factory.h" 16 #include "chrome/browser/search_engines/template_url_service_factory.h"
16 #include "chrome/browser/signin/fake_signin_manager.h" 17 #include "chrome/browser/signin/fake_signin_manager.h"
17 #include "chrome/browser/signin/signin_manager_factory.h" 18 #include "chrome/browser/signin/signin_manager_factory.h"
18 #include "chrome/browser/sync/profile_sync_service.h" 19 #include "chrome/browser/sync/profile_sync_service.h"
19 #include "chrome/browser/sync/profile_sync_service_factory.h" 20 #include "chrome/browser/sync/profile_sync_service_factory.h"
20 #include "chrome/browser/sync/profile_sync_service_mock.h" 21 #include "chrome/browser/sync/profile_sync_service_mock.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 public: 54 public:
54 virtual ~MockSearchIPCRouterDelegate() {} 55 virtual ~MockSearchIPCRouterDelegate() {}
55 56
56 MOCK_METHOD1(OnInstantSupportDetermined, void(bool supports_instant)); 57 MOCK_METHOD1(OnInstantSupportDetermined, void(bool supports_instant));
57 MOCK_METHOD1(OnSetVoiceSearchSupport, void(bool supports_voice_search)); 58 MOCK_METHOD1(OnSetVoiceSearchSupport, void(bool supports_voice_search));
58 MOCK_METHOD1(FocusOmnibox, void(OmniboxFocusState state)); 59 MOCK_METHOD1(FocusOmnibox, void(OmniboxFocusState state));
59 MOCK_METHOD3(NavigateToURL, void(const GURL&, WindowOpenDisposition, bool)); 60 MOCK_METHOD3(NavigateToURL, void(const GURL&, WindowOpenDisposition, bool));
60 MOCK_METHOD1(OnDeleteMostVisitedItem, void(const GURL& url)); 61 MOCK_METHOD1(OnDeleteMostVisitedItem, void(const GURL& url));
61 MOCK_METHOD1(OnUndoMostVisitedDeletion, void(const GURL& url)); 62 MOCK_METHOD1(OnUndoMostVisitedDeletion, void(const GURL& url));
62 MOCK_METHOD0(OnUndoAllMostVisitedDeletions, void()); 63 MOCK_METHOD0(OnUndoAllMostVisitedDeletions, void());
63 MOCK_METHOD1(OnLogEvent, void(NTPLoggingEventType event)); 64 MOCK_METHOD2(OnLogEvent, void(NTPLoggingEventType event,
65 base::TimeDelta time));
64 MOCK_METHOD2(OnLogMostVisitedImpression, 66 MOCK_METHOD2(OnLogMostVisitedImpression,
65 void(int position, const base::string16& provider)); 67 void(int position, const base::string16& provider));
66 MOCK_METHOD2(OnLogMostVisitedNavigation, 68 MOCK_METHOD2(OnLogMostVisitedNavigation,
67 void(int position, const base::string16& provider)); 69 void(int position, const base::string16& provider));
68 MOCK_METHOD1(PasteIntoOmnibox, void(const base::string16&)); 70 MOCK_METHOD1(PasteIntoOmnibox, void(const base::string16&));
69 MOCK_METHOD1(OnChromeIdentityCheck, void(const base::string16& identity)); 71 MOCK_METHOD1(OnChromeIdentityCheck, void(const base::string16& identity));
70 MOCK_METHOD0(OnHistorySyncCheck, void()); 72 MOCK_METHOD0(OnHistorySyncCheck, void());
71 }; 73 };
72 74
73 } // namespace 75 } // namespace
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 } 435 }
434 436
435 TEST_F(SearchTabHelperPrerenderTest, 437 TEST_F(SearchTabHelperPrerenderTest,
436 OnTabActivatedNoPrerenderIfOmniboxBlurred) { 438 OnTabActivatedNoPrerenderIfOmniboxBlurred) {
437 SearchTabHelperPrerenderTest::omnibox_has_focus_ = false; 439 SearchTabHelperPrerenderTest::omnibox_has_focus_ = false;
438 SearchTabHelper* search_tab_helper = 440 SearchTabHelper* search_tab_helper =
439 SearchTabHelper::FromWebContents(web_contents()); 441 SearchTabHelper::FromWebContents(web_contents());
440 search_tab_helper->OnTabActivated(); 442 search_tab_helper->OnTabActivated();
441 ASSERT_FALSE(IsInstantURLMarkedForPrerendering()); 443 ASSERT_FALSE(IsInstantURLMarkedForPrerendering());
442 } 444 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/search_tab_helper.cc ('k') | chrome/browser/ui/webui/metrics_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698