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

Unified Diff: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc

Issue 12212048: Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc
===================================================================
--- chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc (revision 181040)
+++ chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc (working copy)
@@ -70,19 +70,19 @@
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
+ virtual net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
const std::string& scheme,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeInterceptRedirect(
+ virtual net::URLRequestJob* MaybeInterceptRedirect(
const GURL& location,
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
}
- net::URLRequestJob* MaybeInterceptResponse(
+ virtual net::URLRequestJob* MaybeInterceptResponse(
net::URLRequest* request,
net::NetworkDelegate* network_delegate) const OVERRIDE {
return NULL;
@@ -124,31 +124,33 @@
public:
FakeDelegate() : force_os_failure_(false) {}
virtual ~FakeDelegate() { }
- virtual void RegisterExternalHandler(const std::string& protocol) {
+ virtual void RegisterExternalHandler(const std::string& protocol) OVERRIDE {
ASSERT_TRUE(
registered_protocols_.find(protocol) == registered_protocols_.end());
registered_protocols_.insert(protocol);
}
- virtual void DeregisterExternalHandler(const std::string& protocol) {
+ virtual void DeregisterExternalHandler(const std::string& protocol) OVERRIDE {
registered_protocols_.erase(protocol);
}
virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
ShellIntegration::DefaultWebClientObserver* observer,
- const std::string& protocol);
+ const std::string& protocol) OVERRIDE;
virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver(
- ProtocolHandlerRegistry* registry);
+ ProtocolHandlerRegistry* registry) OVERRIDE;
- virtual void RegisterWithOSAsDefaultClient(const std::string& protocol,
- ProtocolHandlerRegistry* reg) {
+ virtual void RegisterWithOSAsDefaultClient(
+ const std::string& protocol,
+ ProtocolHandlerRegistry* reg) OVERRIDE {
ProtocolHandlerRegistry::Delegate::RegisterWithOSAsDefaultClient(protocol,
reg);
ASSERT_FALSE(IsFakeRegisteredWithOS(protocol));
}
- virtual bool IsExternalHandlerRegistered(const std::string& protocol) {
+ virtual bool IsExternalHandlerRegistered(
+ const std::string& protocol) OVERRIDE {
return registered_protocols_.find(protocol) != registered_protocols_.end();
}
@@ -186,7 +188,7 @@
delegate_(registry_delegate) {}
virtual void SetDefaultWebClientUIState(
- ShellIntegration::DefaultWebClientUIState state) {
+ ShellIntegration::DefaultWebClientUIState state) OVERRIDE {
ProtocolHandlerRegistry::DefaultClientObserver::SetDefaultWebClientUIState(
state);
if (state == ShellIntegration::STATE_IS_DEFAULT) {
@@ -255,7 +257,7 @@
void Clear() { events_ = 0; }
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
++events_;
}
@@ -278,7 +280,7 @@
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) {
+ const content::NotificationDetails& details) OVERRIDE {
std::vector<std::string> output;
local_registry_->GetRegisteredProtocols(&output);
called_ = true;
@@ -298,7 +300,7 @@
class TestMessageLoop : public MessageLoop {
public:
TestMessageLoop() : MessageLoop(MessageLoop::TYPE_DEFAULT) {}
- ~TestMessageLoop() {}
+ virtual ~TestMessageLoop() {}
virtual bool IsType(MessageLoop::Type type) const OVERRIDE {
switch (type) {
case MessageLoop::TYPE_UI:

Powered by Google App Engine
This is Rietveld 408576698