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

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

Issue 878573005: Fix {virtual,override,final} build failure on official CrOS build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "chrome/browser/autocomplete/autocomplete_controller.h" 10 #include "chrome/browser/autocomplete/autocomplete_controller.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) override { 131 bool ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) override {
132 return !assume_not_ui_thread_; 132 return !assume_not_ui_thread_;
133 } 133 }
134 134
135 bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) override { 135 bool ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) override {
136 return !assume_not_ui_thread_; 136 return !assume_not_ui_thread_;
137 } 137 }
138 138
139 #if defined(OS_CHROMEOS) 139 #if defined(OS_CHROMEOS)
140 virtual bool ScheduleClearRlzState() override { 140 bool ScheduleClearRlzState() override {
141 return !assume_not_ui_thread_; 141 return !assume_not_ui_thread_;
142 } 142 }
143 #endif 143 #endif
144 144
145 bool SendFinancialPing(const std::string& brand, 145 bool SendFinancialPing(const std::string& brand,
146 const base::string16& lang, 146 const base::string16& lang,
147 const base::string16& referral) override { 147 const base::string16& referral) override {
148 // Don't ping the server during tests, just pretend as if we did. 148 // Don't ping the server during tests, just pretend as if we did.
149 EXPECT_FALSE(brand.empty()); 149 EXPECT_FALSE(brand.empty());
150 pinged_brands_.insert(brand); 150 pinged_brands_.insert(brand);
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
906 RLZTracker::RecordProductEvent(rlz_lib::CHROME, RLZTracker::ChromeOmnibox(), 906 RLZTracker::RecordProductEvent(rlz_lib::CHROME, RLZTracker::ChromeOmnibox(),
907 rlz_lib::FIRST_SEARCH); 907 rlz_lib::FIRST_SEARCH);
908 908
909 ExpectEventRecorded(kOmniboxFirstSearch, true); 909 ExpectEventRecorded(kOmniboxFirstSearch, true);
910 910
911 RLZTracker::ClearRlzState(); 911 RLZTracker::ClearRlzState();
912 912
913 ExpectEventRecorded(kOmniboxFirstSearch, false); 913 ExpectEventRecorded(kOmniboxFirstSearch, false);
914 } 914 }
915 #endif // defined(OS_CHROMEOS) 915 #endif // defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698