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

Side by Side Diff: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string.h> 5 #include <string.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/guid.h" 8 #include "base/guid.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 return entry; 75 return entry;
76 } 76 }
77 77
78 } // namespace 78 } // namespace
79 79
80 class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest { 80 class DomDistillerViewerSourceBrowserTest : public InProcessBrowserTest {
81 public: 81 public:
82 DomDistillerViewerSourceBrowserTest() {} 82 DomDistillerViewerSourceBrowserTest() {}
83 virtual ~DomDistillerViewerSourceBrowserTest() {} 83 virtual ~DomDistillerViewerSourceBrowserTest() {}
84 84
85 virtual void SetUpOnMainThread() OVERRIDE { 85 virtual void SetUpOnMainThread() override {
86 database_model_ = new FakeDB<ArticleEntry>::EntryMap; 86 database_model_ = new FakeDB<ArticleEntry>::EntryMap;
87 } 87 }
88 88
89 virtual void TearDownOnMainThread() OVERRIDE { delete database_model_; } 89 virtual void TearDownOnMainThread() override { delete database_model_; }
90 90
91 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 91 virtual void SetUpCommandLine(CommandLine* command_line) override {
92 command_line->AppendSwitch(switches::kEnableDomDistiller); 92 command_line->AppendSwitch(switches::kEnableDomDistiller);
93 } 93 }
94 94
95 static KeyedService* Build(content::BrowserContext* context) { 95 static KeyedService* Build(content::BrowserContext* context) {
96 FakeDB<ArticleEntry>* fake_db = new FakeDB<ArticleEntry>(database_model_); 96 FakeDB<ArticleEntry>* fake_db = new FakeDB<ArticleEntry>(database_model_);
97 distiller_factory_ = new MockDistillerFactory(); 97 distiller_factory_ = new MockDistillerFactory();
98 MockDistillerPageFactory* distiller_page_factory_ = 98 MockDistillerPageFactory* distiller_page_factory_ =
99 new MockDistillerPageFactory(); 99 new MockDistillerPageFactory();
100 DomDistillerContextKeyedService* service = 100 DomDistillerContextKeyedService* service =
101 new DomDistillerContextKeyedService( 101 new DomDistillerContextKeyedService(
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 EXPECT_EQ("dark sans-serif", result); 355 EXPECT_EQ("dark sans-serif", result);
356 356
357 distilled_page_prefs->SetFontFamily(DistilledPagePrefs::SERIF); 357 distilled_page_prefs->SetFontFamily(DistilledPagePrefs::SERIF);
358 base::RunLoop().RunUntilIdle(); 358 base::RunLoop().RunUntilIdle();
359 EXPECT_TRUE( 359 EXPECT_TRUE(
360 content::ExecuteScriptAndExtractString(contents, kGetBodyClass, &result)); 360 content::ExecuteScriptAndExtractString(contents, kGetBodyClass, &result));
361 EXPECT_EQ("dark serif", result); 361 EXPECT_EQ("dark serif", result);
362 } 362 }
363 363
364 } // namespace dom_distiller 364 } // namespace dom_distiller
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698