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

Side by Side Diff: chrome/browser/rlz/rlz_unittest.cc

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/rlz/rlz.h" 5 #include "chrome/browser/rlz/rlz.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/test/test_reg_util_win.h" 10 #include "base/test/test_reg_util_win.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 } 199 }
200 200
201 void RlzLibTest::SimulateOmniboxUsage() { 201 void RlzLibTest::SimulateOmniboxUsage() {
202 tracker_.Observe(chrome::NOTIFICATION_OMNIBOX_OPENED_URL, 202 tracker_.Observe(chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
203 NotificationService::AllSources(), 203 NotificationService::AllSources(),
204 Details<AutocompleteLog>(NULL)); 204 Details<AutocompleteLog>(NULL));
205 } 205 }
206 206
207 void RlzLibTest::SimulateHomepageUsage() { 207 void RlzLibTest::SimulateHomepageUsage() {
208 NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(), 208 NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(),
209 content::PAGE_TRANSITION_HOME_PAGE); 209 content::PAGE_TRANSITION_HOME_PAGE, false);
210 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING, 210 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
211 NotificationService::AllSources(), 211 NotificationService::AllSources(),
212 Details<NavigationEntry>(&entry)); 212 Details<NavigationEntry>(&entry));
213 } 213 }
214 214
215 void RlzLibTest::InvokeDelayedInit() { 215 void RlzLibTest::InvokeDelayedInit() {
216 tracker_.DelayedInit(); 216 tracker_.DelayedInit();
217 } 217 }
218 218
219 void RlzLibTest::ExpectEventRecorded(const char* event_name, bool expected) { 219 void RlzLibTest::ExpectEventRecorded(const char* event_name, bool expected) {
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 tracker_.set_assume_not_ui_thread(false); 534 tracker_.set_assume_not_ui_thread(false);
535 535
536 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz)); 536 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz));
537 EXPECT_STREQ(kNewOmniboxRlzString, WideToUTF8(rlz).c_str()); 537 EXPECT_STREQ(kNewOmniboxRlzString, WideToUTF8(rlz).c_str());
538 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz)); 538 EXPECT_TRUE(RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_HOME_PAGE, &rlz));
539 EXPECT_STREQ(kNewHomepageRlzString, WideToUTF8(rlz).c_str()); 539 EXPECT_STREQ(kNewHomepageRlzString, WideToUTF8(rlz).c_str());
540 } 540 }
541 541
542 TEST_F(RlzLibTest, ObserveHandlesBadArgs) { 542 TEST_F(RlzLibTest, ObserveHandlesBadArgs) {
543 NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(), 543 NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(),
544 content::PAGE_TRANSITION_LINK); 544 content::PAGE_TRANSITION_LINK, false);
545 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING, 545 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
546 NotificationService::AllSources(), 546 NotificationService::AllSources(),
547 Details<NavigationEntry>(NULL)); 547 Details<NavigationEntry>(NULL));
548 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING, 548 tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
549 NotificationService::AllSources(), 549 NotificationService::AllSources(),
550 Details<NavigationEntry>(&entry)); 550 Details<NavigationEntry>(&entry));
551 } 551 }
OLDNEW
« no previous file with comments | « chrome/browser/oom_priority_manager_browsertest.cc ('k') | chrome/browser/sessions/session_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698