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

Unified Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/search/instant_extended_interactive_uitest.cc
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 06d196da2e3c2ef32f9a103b7b199f9190bbd1db..a16329a23ea574a48e692a73a5fe71af01702272 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -90,17 +90,15 @@ class QuittingHistoryDBTask : public history::HistoryDBTask {
public:
QuittingHistoryDBTask() {}
- virtual bool RunOnDBThread(history::HistoryBackend* backend,
- history::HistoryDatabase* db) override {
+ bool RunOnDBThread(history::HistoryBackend* backend,
+ history::HistoryDatabase* db) override {
return true;
}
- virtual void DoneRunOnMainThread() override {
- base::MessageLoop::current()->Quit();
- }
+ void DoneRunOnMainThread() override { base::MessageLoop::current()->Quit(); }
private:
- virtual ~QuittingHistoryDBTask() {}
+ ~QuittingHistoryDBTask() override {}
DISALLOW_COPY_AND_ASSIGN(QuittingHistoryDBTask);
};
@@ -109,7 +107,7 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
public:
FakeNetworkChangeNotifier() : connection_type_(CONNECTION_NONE) {}
- virtual ConnectionType GetCurrentConnectionType() const override {
+ ConnectionType GetCurrentConnectionType() const override {
return connection_type_;
}
@@ -119,7 +117,7 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
base::RunLoop().RunUntilIdle();
}
- virtual ~FakeNetworkChangeNotifier() {}
+ ~FakeNetworkChangeNotifier() override {}
private:
ConnectionType connection_type_;
@@ -143,7 +141,7 @@ class InstantExtendedTest : public InProcessBrowserTest,
on_toggle_voice_search_calls_(0) {
}
protected:
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
chrome::EnableQueryExtractionForTesting();
ASSERT_TRUE(https_test_server().Start());
GURL instant_url = https_test_server().GetURL(
@@ -258,7 +256,7 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
}
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
chrome::EnableQueryExtractionForTesting();
ASSERT_TRUE(https_test_server().Start());
GURL instant_url = https_test_server().GetURL(
@@ -268,7 +266,7 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
InstantTestBase::Init(instant_url, ntp_url, true);
}
- virtual void SetUpCommandLine(CommandLine* command_line) override {
+ void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitchASCII(
switches::kForceFieldTrials,
"EmbeddedSearch/Group11 prefetch_results_srp:1/");
@@ -288,13 +286,13 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
class InstantExtendedNetworkTest : public InstantExtendedTest {
protected:
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
InstantExtendedTest::SetUpOnMainThread();
}
- virtual void TearDownOnMainThread() override {
+ void TearDownOnMainThread() override {
InstantExtendedTest::TearDownOnMainThread();
fake_network_change_notifier_.reset();
disable_for_test_.reset();
@@ -317,7 +315,7 @@ class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
InstantPolicyTest() {}
protected:
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
ASSERT_TRUE(https_test_server().Start());
GURL instant_url = https_test_server().GetURL(
"files/instant_extended.html?strk=1&");

Powered by Google App Engine
This is Rietveld 408576698