Cosmetic cleanups in chrome/browser/policy/

chrome/browser/policy/mock_configuration_policy_provider.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_
 #pragma once
 
-#include <map>
-#include <utility>
-
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
-#include "testing/gmock/include/gmock/gmock.h"
 
 namespace policy {
 
 // Mock ConfigurationPolicyProvider implementation that supplies canned
 // values for polices.
 class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
  public:
   MockConfigurationPolicyProvider();
   virtual ~MockConfigurationPolicyProvider();
 
   void AddPolicy(ConfigurationPolicyType policy, Value* value);
   void RemovePolicy(ConfigurationPolicyType policy);
 
   void SetInitializationComplete(bool initialization_complete);
 
   // ConfigurationPolicyProvider method overrides.
-  virtual bool Provide(PolicyMap* policies);
-  virtual bool IsInitializationComplete() const;
+  virtual bool Provide(PolicyMap* policies) OVERRIDE;
+  virtual bool IsInitializationComplete() const OVERRIDE;
 
  private:
   // ConfigurationPolicyProvider overrides:
-  virtual void AddObserver(ConfigurationPolicyProvider::Observer* observer) {}
+  virtual void AddObserver(
+      ConfigurationPolicyProvider::Observer* observer) OVERRIDE {}

[pastarmovj, 2011/09/20 13:14:08]

Don't we put a single space between { } when the body is empty?

[Joao da Silva, 2011/09/20 18:51:17]

I'm not sure about this, so I ran a quick grep job:

chrome/browser# grep '{ }' | wc -l 
207
chrome/browser# grep '{}' | wc -l 
3553
chrome/browser/policy# grep '{ }' | wc -l 
0
chrome/browser# grep '{}' | wc -l 
105

I'd stick with the common pattern for now, if that's ok with you too :-)

   virtual void RemoveObserver(
-      ConfigurationPolicyProvider::Observer* observer) {}
+      ConfigurationPolicyProvider::Observer* observer) OVERRIDE {}
 
   PolicyMap policy_map_;
   bool initialization_complete_;
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_MOCK_CONFIGURATION_POLICY_PROVIDER_H_