Cosmetic cleanups in chrome/browser/policy/

chrome/browser/policy/mock_configuration_policy_provider.h

Index: chrome/browser/policy/mock_configuration_policy_provider.h
diff --git a/chrome/browser/policy/mock_configuration_policy_provider.h b/chrome/browser/policy/mock_configuration_policy_provider.h
index de266dc917e0ddcb3c824e17a0953eea08ecbb4a..bb6121583d6e386f5aee2cea6f3e2ab93d345350 100644
--- a/chrome/browser/policy/mock_configuration_policy_provider.h
+++ b/chrome/browser/policy/mock_configuration_policy_provider.h
@@ -6,12 +6,8 @@
 #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 {
 
@@ -28,14 +24,15 @@ class MockConfigurationPolicyProvider : public ConfigurationPolicyProvider {
   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 {}
   virtual void RemoveObserver(
-      ConfigurationPolicyProvider::Observer* observer) {}
+      ConfigurationPolicyProvider::Observer* observer) OVERRIDE {}
 
   PolicyMap policy_map_;
   bool initialization_complete_;