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

Side by Side Diff: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (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 unified diff | Download patch
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/extensions/api/push_messaging/push_messaging_api.h" 5 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
6 6
7 #include "apps/launcher.h" 7 #include "apps/launcher.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h" 9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h"
10 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_mapper.h" 10 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_mapper.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 MockInvalidationMapper::~MockInvalidationMapper() {} 66 MockInvalidationMapper::~MockInvalidationMapper() {}
67 67
68 } // namespace 68 } // namespace
69 69
70 class PushMessagingApiTest : public ExtensionApiTest { 70 class PushMessagingApiTest : public ExtensionApiTest {
71 public: 71 public:
72 PushMessagingApiTest() 72 PushMessagingApiTest()
73 : fake_invalidation_service_(NULL) { 73 : fake_invalidation_service_(NULL) {
74 } 74 }
75 75
76 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 76 virtual void SetUpCommandLine(CommandLine* command_line) override {
77 ExtensionApiTest::SetUpCommandLine(command_line); 77 ExtensionApiTest::SetUpCommandLine(command_line);
78 } 78 }
79 79
80 virtual void SetUp() OVERRIDE { 80 virtual void SetUp() override {
81 invalidation::ProfileInvalidationProviderFactory::GetInstance()-> 81 invalidation::ProfileInvalidationProviderFactory::GetInstance()->
82 RegisterTestingFactory(BuildFakeProfileInvalidationProvider); 82 RegisterTestingFactory(BuildFakeProfileInvalidationProvider);
83 ExtensionApiTest::SetUp(); 83 ExtensionApiTest::SetUp();
84 } 84 }
85 85
86 virtual void SetUpOnMainThread() OVERRIDE { 86 virtual void SetUpOnMainThread() override {
87 ExtensionApiTest::SetUpOnMainThread(); 87 ExtensionApiTest::SetUpOnMainThread();
88 fake_invalidation_service_ = 88 fake_invalidation_service_ =
89 static_cast<invalidation::FakeInvalidationService*>( 89 static_cast<invalidation::FakeInvalidationService*>(
90 static_cast<invalidation::ProfileInvalidationProvider*>( 90 static_cast<invalidation::ProfileInvalidationProvider*>(
91 invalidation::ProfileInvalidationProviderFactory:: 91 invalidation::ProfileInvalidationProviderFactory::
92 GetInstance()->GetForProfile(profile()))-> 92 GetInstance()->GetForProfile(profile()))->
93 GetInvalidationService()); 93 GetInvalidationService());
94 } 94 }
95 95
96 void EmitInvalidation( 96 void EmitInvalidation(
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 const extensions::Extension* extension = 202 const extensions::Extension* extension =
203 LoadExtension(test_data_dir_.AppendASCII("push_messaging")); 203 LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
204 ASSERT_TRUE(extension); 204 ASSERT_TRUE(extension);
205 ui_test_utils::NavigateToURL( 205 ui_test_utils::NavigateToURL(
206 browser(), extension->GetResourceURL("get_channel_id.html")); 206 browser(), extension->GetResourceURL("get_channel_id.html"));
207 207
208 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 208 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
209 } 209 }
210 210
211 } // namespace extensions 211 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698