| Index: components/dom_distiller/core/viewer_unittest.cc
|
| diff --git a/components/dom_distiller/core/viewer_unittest.cc b/components/dom_distiller/core/viewer_unittest.cc
|
| index 35e242f53c8a5ecf2779577009c0d413b32f089a..2e7478a047abf9ca0e8f378bb4e08b7f2e126b59 100644
|
| --- a/components/dom_distiller/core/viewer_unittest.cc
|
| +++ b/components/dom_distiller/core/viewer_unittest.cc
|
| @@ -17,7 +17,7 @@ const char kTestScheme[] = "myscheme";
|
|
|
| class FakeViewRequestDelegate : public ViewRequestDelegate {
|
| public:
|
| - virtual ~FakeViewRequestDelegate() {}
|
| + ~FakeViewRequestDelegate() override {}
|
| MOCK_METHOD1(OnArticleReady, void(const DistilledArticleProto* proto));
|
| MOCK_METHOD1(OnArticleUpdated,
|
| void(ArticleDistillationUpdate article_update));
|
| @@ -26,17 +26,17 @@ class FakeViewRequestDelegate : public ViewRequestDelegate {
|
| class TestDomDistillerService : public DomDistillerServiceInterface {
|
| public:
|
| TestDomDistillerService() {}
|
| - virtual ~TestDomDistillerService() {}
|
| + ~TestDomDistillerService() override {}
|
|
|
| MOCK_CONST_METHOD0(GetSyncableService, syncer::SyncableService*());
|
| MOCK_METHOD3(AddToList,
|
| const std::string(const GURL&,
|
| DistillerPage*,
|
| const ArticleAvailableCallback&));
|
| - virtual const std::string AddToList(
|
| + const std::string AddToList(
|
| const GURL& url,
|
| scoped_ptr<DistillerPage> distiller_page,
|
| - const ArticleAvailableCallback& article_cb) {
|
| + const ArticleAvailableCallback& article_cb) override {
|
| return AddToList(url, distiller_page.get(), article_cb);
|
| }
|
| MOCK_METHOD1(HasEntry, bool(const std::string&));
|
| @@ -45,32 +45,32 @@ class TestDomDistillerService : public DomDistillerServiceInterface {
|
| MOCK_METHOD1(AddObserver, void(DomDistillerObserver*));
|
| MOCK_METHOD1(RemoveObserver, void(DomDistillerObserver*));
|
| MOCK_METHOD0(ViewUrlImpl, ViewerHandle*());
|
| - virtual scoped_ptr<ViewerHandle> ViewUrl(
|
| + scoped_ptr<ViewerHandle> ViewUrl(
|
| ViewRequestDelegate*,
|
| scoped_ptr<DistillerPage> distiller_page,
|
| - const GURL&) {
|
| + const GURL&) override {
|
| return scoped_ptr<ViewerHandle>(ViewUrlImpl());
|
| }
|
| MOCK_METHOD0(ViewEntryImpl, ViewerHandle*());
|
| - virtual scoped_ptr<ViewerHandle> ViewEntry(
|
| + scoped_ptr<ViewerHandle> ViewEntry(
|
| ViewRequestDelegate*,
|
| scoped_ptr<DistillerPage> distiller_page,
|
| - const std::string&) {
|
| + const std::string&) override {
|
| return scoped_ptr<ViewerHandle>(ViewEntryImpl());
|
| }
|
| MOCK_METHOD0(RemoveEntryImpl, ArticleEntry*());
|
| - virtual scoped_ptr<ArticleEntry> RemoveEntry(const std::string&) {
|
| + scoped_ptr<ArticleEntry> RemoveEntry(const std::string&) override {
|
| return scoped_ptr<ArticleEntry>(RemoveEntryImpl());
|
| }
|
| - virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
|
| - const gfx::Size& render_view_size) {
|
| + scoped_ptr<DistillerPage> CreateDefaultDistillerPage(
|
| + const gfx::Size& render_view_size) override {
|
| return scoped_ptr<DistillerPage>();
|
| }
|
| - virtual scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
|
| - scoped_ptr<SourcePageHandle> handle) {
|
| + scoped_ptr<DistillerPage> CreateDefaultDistillerPageWithHandle(
|
| + scoped_ptr<SourcePageHandle> handle) override {
|
| return scoped_ptr<DistillerPage>();
|
| }
|
| - virtual DistilledPagePrefs* GetDistilledPagePrefs() override;
|
| + DistilledPagePrefs* GetDistilledPagePrefs() override;
|
| };
|
|
|
| class DomDistillerViewerTest : public testing::Test {
|
|
|