diff options
Diffstat (limited to 'chrome/browser/policy')
22 files changed, 29 insertions, 29 deletions
diff --git a/chrome/browser/policy/asynchronous_policy_loader.h b/chrome/browser/policy/asynchronous_policy_loader.h index 677ce6f..fff0c8c 100644 --- a/chrome/browser/policy/asynchronous_policy_loader.h +++ b/chrome/browser/policy/asynchronous_policy_loader.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -6,9 +6,9 @@ #define CHROME_BROWSER_POLICY_ASYNCHRONOUS_POLICY_LOADER_H_ #pragma once +#include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/observer_list.h" -#include "base/ref_counted.h" #include "base/values.h" #include "chrome/browser/policy/asynchronous_policy_provider.h" #include "chrome/browser/policy/configuration_policy_provider.h" diff --git a/chrome/browser/policy/asynchronous_policy_provider.h b/chrome/browser/policy/asynchronous_policy_provider.h index a6079dc..c030972 100644 --- a/chrome/browser/policy/asynchronous_policy_provider.h +++ b/chrome/browser/policy/asynchronous_policy_provider.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -6,9 +6,9 @@ #define CHROME_BROWSER_POLICY_ASYNCHRONOUS_POLICY_PROVIDER_H_ #pragma once -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" +#include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" -#include "base/weak_ptr.h" #include "chrome/browser/policy/configuration_policy_provider.h" namespace policy { diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h index 70eef93..3ad0d3c 100644 --- a/chrome/browser/policy/browser_policy_connector.h +++ b/chrome/browser/policy/browser_policy_connector.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/policy/cloud_policy_cache.h b/chrome/browser/policy/cloud_policy_cache.h index ce7965b..3f303b1 100644 --- a/chrome/browser/policy/cloud_policy_cache.h +++ b/chrome/browser/policy/cloud_policy_cache.h @@ -9,9 +9,9 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "chrome/browser/policy/configuration_policy_provider.h" diff --git a/chrome/browser/policy/cloud_policy_cache_unittest.cc b/chrome/browser/policy/cloud_policy_cache_unittest.cc index 4f3b1c5..d0bf31a 100644 --- a/chrome/browser/policy/cloud_policy_cache_unittest.cc +++ b/chrome/browser/policy/cloud_policy_cache_unittest.cc @@ -8,8 +8,8 @@ #include <string> #include "base/file_util.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" diff --git a/chrome/browser/policy/cloud_policy_controller.h b/chrome/browser/policy/cloud_policy_controller.h index 1ded702..44c3195 100644 --- a/chrome/browser/policy/cloud_policy_controller.h +++ b/chrome/browser/policy/cloud_policy_controller.h @@ -9,8 +9,8 @@ #include <string> #include "base/file_path.h" +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/policy/cloud_policy_identity_strategy.h" diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc index 2bb56c9..b3adc97 100644 --- a/chrome/browser/policy/cloud_policy_controller_unittest.cc +++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/policy/cloud_policy_controller.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "chrome/browser/policy/cloud_policy_cache.h" #include "chrome/browser/policy/device_token_fetcher.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/policy/cloud_policy_subsystem.h b/chrome/browser/policy/cloud_policy_subsystem.h index 9bb8ede..398c997 100644 --- a/chrome/browser/policy/cloud_policy_subsystem.h +++ b/chrome/browser/policy/cloud_policy_subsystem.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_CLOUD_POLICY_SUBSYSTEM_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/prefs/pref_member.h" #include "content/common/notification_observer.h" diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 22ea5e5..944cfa9 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -5,8 +5,8 @@ #include <algorithm> #include "base/file_util.h" +#include "base/memory/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "chrome/browser/policy/config_dir_policy_provider.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h index a66b72c..784a7ec 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.h +++ b/chrome/browser/policy/configuration_policy_pref_store.h @@ -10,8 +10,8 @@ #include <string> #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_provider.h" #include "chrome/browser/policy/configuration_policy_store_interface.h" diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index a8c46a3..1c353f0 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_path.h" -#include "base/ref_counted.h" +#include "base/memory/ref_counted.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" diff --git a/chrome/browser/policy/configuration_policy_provider.h b/chrome/browser/policy/configuration_policy_provider.h index 32fc885..9371a65 100644 --- a/chrome/browser/policy/configuration_policy_provider.h +++ b/chrome/browser/policy/configuration_policy_provider.h @@ -10,7 +10,7 @@ #include <string> #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/browser/policy/configuration_policy_store_interface.h" #include "policy/configuration_policy_type.h" diff --git a/chrome/browser/policy/configuration_policy_provider_mac.h b/chrome/browser/policy/configuration_policy_provider_mac.h index 0dff4df..8be0d44 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac.h +++ b/chrome/browser/policy/configuration_policy_provider_mac.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -6,7 +6,7 @@ #define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PROVIDER_MAC_H_ #pragma once -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/policy/configuration_policy_store_interface.h" #include "chrome/browser/policy/file_based_policy_provider.h" #include "chrome/browser/preferences_mac.h" diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index aa11d1f..52f21e8 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -5,8 +5,8 @@ #include <gtest/gtest.h> #include <windows.h> +#include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_ptr.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/string_piece.h" diff --git a/chrome/browser/policy/device_policy_identity_strategy.h b/chrome/browser/policy/device_policy_identity_strategy.h index cf5030a..365ed0f 100644 --- a/chrome/browser/policy/device_policy_identity_strategy.h +++ b/chrome/browser/policy/device_policy_identity_strategy.h @@ -8,8 +8,8 @@ #include <string> -#include "base/ref_counted.h" -#include "base/weak_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_identity_strategy.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" diff --git a/chrome/browser/policy/device_token_fetcher.h b/chrome/browser/policy/device_token_fetcher.h index 4dbecd0..3b9337f 100644 --- a/chrome/browser/policy/device_token_fetcher.h +++ b/chrome/browser/policy/device_token_fetcher.h @@ -8,8 +8,8 @@ #include <string> +#include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/policy/device_management_backend.h" #include "chrome/browser/policy/proto/device_management_backend.pb.h" diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc index 95e4dda..c61dce9 100644 --- a/chrome/browser/policy/device_token_fetcher_unittest.cc +++ b/chrome/browser/policy/device_token_fetcher_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/policy/device_token_fetcher.h" #include "base/file_util.h" +#include "base/memory/scoped_temp_dir.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/policy/cloud_policy_cache.h" #include "chrome/browser/policy/device_management_service.h" diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h index 181fda6..74ea069 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.h +++ b/chrome/browser/policy/managed_prefs_banner_base.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/options/options_window.h" #include "content/common/notification_observer.h" diff --git a/chrome/browser/policy/policy_map_unittest.cc b/chrome/browser/policy/policy_map_unittest.cc index 01aad95..c540bbb 100644 --- a/chrome/browser/policy/policy_map_unittest.cc +++ b/chrome/browser/policy/policy_map_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/policy/policy_map.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "policy/configuration_policy_type.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/policy_path_parser_win.cc b/chrome/browser/policy/policy_path_parser_win.cc index d4a2a3b..89c3a44 100644 --- a/chrome/browser/policy/policy_path_parser_win.cc +++ b/chrome/browser/policy/policy_path_parser_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/policy/policy_path_parser.h" #include "base/logging.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" namespace policy { diff --git a/chrome/browser/policy/profile_policy_connector.h b/chrome/browser/policy/profile_policy_connector.h index f65d077..1df9302 100644 --- a/chrome/browser/policy/profile_policy_connector.h +++ b/chrome/browser/policy/profile_policy_connector.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" class Profile; diff --git a/chrome/browser/policy/user_policy_identity_strategy.h b/chrome/browser/policy/user_policy_identity_strategy.h index 6ab07c0..5c32c22 100644 --- a/chrome/browser/policy/user_policy_identity_strategy.h +++ b/chrome/browser/policy/user_policy_identity_strategy.h @@ -9,8 +9,8 @@ #include <string> #include "base/file_path.h" -#include "base/ref_counted.h" -#include "base/weak_ptr.h" +#include "base/memory/ref_counted.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/policy/cloud_policy_identity_strategy.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" |