summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 11:29:39 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 11:29:39 +0000
commit631bb742a2798549af691af7357236ce0899b4cb (patch)
tree1852356dc787a9c65e892ea1a57dfc03595d2bb4 /chrome/browser/policy
parente301da283ab61ff78a108d5ed3246d8b09614ef2 (diff)
downloadchromium_src-631bb742a2798549af691af7357236ce0899b4cb.zip
chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.gz
chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.bz2
Move BrowserThread to content namespace.
TBR=owners BUG=98716 Review URL: http://codereview.chromium.org/8437002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
-rw-r--r--chrome/browser/policy/asynchronous_policy_loader.cc2
-rw-r--r--chrome/browser/policy/asynchronous_policy_test_base.cc2
-rw-r--r--chrome/browser/policy/browser_policy_connector.cc2
-rw-r--r--chrome/browser/policy/cloud_policy_controller_unittest.cc1
-rw-r--r--chrome/browser/policy/cloud_policy_subsystem_unittest.cc1
-rw-r--r--chrome/browser/policy/config_dir_policy_provider_unittest.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_loader_win.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store.cc2
-rw-r--r--chrome/browser/policy/configuration_policy_provider_win_unittest.cc1
-rw-r--r--chrome/browser/policy/device_management_service.cc2
-rw-r--r--chrome/browser/policy/device_management_service_unittest.cc1
-rw-r--r--chrome/browser/policy/device_token_fetcher_unittest.cc1
-rw-r--r--chrome/browser/policy/enterprise_metrics_browsertest.cc1
-rw-r--r--chrome/browser/policy/file_based_policy_loader.cc1
-rw-r--r--chrome/browser/policy/logging_work_scheduler.cc2
-rw-r--r--chrome/browser/policy/logging_work_scheduler_unittest.cc2
-rw-r--r--chrome/browser/policy/url_blacklist_manager.cc2
-rw-r--r--chrome/browser/policy/url_blacklist_manager_unittest.cc1
-rw-r--r--chrome/browser/policy/user_policy_cache_unittest.cc1
-rw-r--r--chrome/browser/policy/user_policy_disk_cache.cc2
-rw-r--r--chrome/browser/policy/user_policy_token_cache.cc2
21 files changed, 33 insertions, 0 deletions
diff --git a/chrome/browser/policy/asynchronous_policy_loader.cc b/chrome/browser/policy/asynchronous_policy_loader.cc
index a31babf..5c45042 100644
--- a/chrome/browser/policy/asynchronous_policy_loader.cc
+++ b/chrome/browser/policy/asynchronous_policy_loader.cc
@@ -8,6 +8,8 @@
#include "base/message_loop.h"
#include "content/public/browser/browser_thread.h"
+using content::BrowserThread;
+
namespace policy {
AsynchronousPolicyLoader::AsynchronousPolicyLoader(
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.cc b/chrome/browser/policy/asynchronous_policy_test_base.cc
index c7d9490..50510ec 100644
--- a/chrome/browser/policy/asynchronous_policy_test_base.cc
+++ b/chrome/browser/policy/asynchronous_policy_test_base.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/policy/asynchronous_policy_test_base.h"
+using content::BrowserThread;
+
namespace policy {
ProviderDelegateMock::ProviderDelegateMock()
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 3930466..6ca79b4 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -40,6 +40,8 @@
#include "chrome/browser/policy/device_policy_cache.h"
#endif
+using content::BrowserThread;
+
namespace policy {
namespace {
diff --git a/chrome/browser/policy/cloud_policy_controller_unittest.cc b/chrome/browser/policy/cloud_policy_controller_unittest.cc
index a110629..68d57bd 100644
--- a/chrome/browser/policy/cloud_policy_controller_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_controller_unittest.cc
@@ -24,6 +24,7 @@ namespace policy {
using ::testing::AnyNumber;
using ::testing::InSequence;
using ::testing::_;
+using content::BrowserThread;
class MockDeviceTokenFetcher : public DeviceTokenFetcher {
public:
diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
index 1f80df0..c27313d 100644
--- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
@@ -28,6 +28,7 @@ namespace policy {
using ::testing::_;
using ::testing::AtMost;
using ::testing::InSequence;
+using content::BrowserThread;
namespace em = enterprise_management;
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
index a3cb1a8c..bb71813 100644
--- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc
+++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc
@@ -16,6 +16,8 @@
#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::BrowserThread;
+
namespace policy {
template<typename BASE>
diff --git a/chrome/browser/policy/configuration_policy_loader_win.cc b/chrome/browser/policy/configuration_policy_loader_win.cc
index dfc10d8..49b1053 100644
--- a/chrome/browser/policy/configuration_policy_loader_win.cc
+++ b/chrome/browser/policy/configuration_policy_loader_win.cc
@@ -11,6 +11,8 @@
// userenv.dll is required for RegisterGPNotification().
#pragma comment(lib, "userenv.lib")
+using content::BrowserThread;
+
namespace policy {
ConfigurationPolicyLoaderWin::ConfigurationPolicyLoaderWin(
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index aee5d88..3a22310 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -20,6 +20,8 @@
#include "content/public/browser/browser_thread.h"
#include "policy/policy_constants.h"
+using content::BrowserThread;
+
namespace policy {
namespace {
diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
index 18dcc48..dc03bdb 100644
--- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc
@@ -22,6 +22,7 @@
#include "testing/gtest/include/gtest/gtest.h"
using base::win::RegKey;
+using content::BrowserThread;
namespace policy {
diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc
index 1bd6e83..e2983d7 100644
--- a/chrome/browser/policy/device_management_service.cc
+++ b/chrome/browser/policy/device_management_service.cc
@@ -26,6 +26,8 @@
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_status.h"
+using content::BrowserThread;
+
namespace policy {
namespace {
diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc
index df5e3bc3..34c585f 100644
--- a/chrome/browser/policy/device_management_service_unittest.cc
+++ b/chrome/browser/policy/device_management_service_unittest.cc
@@ -23,6 +23,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::BrowserThread;
using testing::IgnoreResult;
using testing::InvokeWithoutArgs;
using testing::_;
diff --git a/chrome/browser/policy/device_token_fetcher_unittest.cc b/chrome/browser/policy/device_token_fetcher_unittest.cc
index 562ae68..f3f5fbe 100644
--- a/chrome/browser/policy/device_token_fetcher_unittest.cc
+++ b/chrome/browser/policy/device_token_fetcher_unittest.cc
@@ -21,6 +21,7 @@ namespace policy {
const char kTestToken[] = "device_token_fetcher_test_auth_token";
+using content::BrowserThread;
using testing::_;
using testing::AnyNumber;
using testing::Mock;
diff --git a/chrome/browser/policy/enterprise_metrics_browsertest.cc b/chrome/browser/policy/enterprise_metrics_browsertest.cc
index dd968fb..658ea54 100644
--- a/chrome/browser/policy/enterprise_metrics_browsertest.cc
+++ b/chrome/browser/policy/enterprise_metrics_browsertest.cc
@@ -40,6 +40,7 @@ namespace policy {
namespace em = enterprise_management;
+using content::BrowserThread;
using testing::AnyNumber;
using testing::DoAll;
using testing::Invoke;
diff --git a/chrome/browser/policy/file_based_policy_loader.cc b/chrome/browser/policy/file_based_policy_loader.cc
index 7f9a0ae..c7a8691 100644
--- a/chrome/browser/policy/file_based_policy_loader.cc
+++ b/chrome/browser/policy/file_based_policy_loader.cc
@@ -10,6 +10,7 @@
#include "content/public/browser/browser_thread.h"
using ::base::files::FilePathWatcher;
+using content::BrowserThread;
namespace {
diff --git a/chrome/browser/policy/logging_work_scheduler.cc b/chrome/browser/policy/logging_work_scheduler.cc
index 6947172..841df96 100644
--- a/chrome/browser/policy/logging_work_scheduler.cc
+++ b/chrome/browser/policy/logging_work_scheduler.cc
@@ -10,6 +10,8 @@
#include "base/message_loop.h"
#include "content/public/browser/browser_thread.h"
+using content::BrowserThread;
+
namespace policy {
// Objects of this class are used in the priority-queue of future tasks
diff --git a/chrome/browser/policy/logging_work_scheduler_unittest.cc b/chrome/browser/policy/logging_work_scheduler_unittest.cc
index 6406a1c..bb77738 100644
--- a/chrome/browser/policy/logging_work_scheduler_unittest.cc
+++ b/chrome/browser/policy/logging_work_scheduler_unittest.cc
@@ -11,6 +11,8 @@
#include "content/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::BrowserThread;
+
namespace policy {
class LoggingWorkSchedulerTest : public testing::Test {
diff --git a/chrome/browser/policy/url_blacklist_manager.cc b/chrome/browser/policy/url_blacklist_manager.cc
index 59a0e13..66082bf 100644
--- a/chrome/browser/policy/url_blacklist_manager.cc
+++ b/chrome/browser/policy/url_blacklist_manager.cc
@@ -17,6 +17,8 @@
#include "content/public/browser/notification_source.h"
#include "googleurl/src/gurl.h"
+using content::BrowserThread;
+
namespace policy {
namespace {
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index 24a6d05..647058e 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -22,6 +22,7 @@ namespace {
using ::testing::_;
using ::testing::Invoke;
using ::testing::Mock;
+using content::BrowserThread;
class TestingURLBlacklistManager : public URLBlacklistManager {
public:
diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc
index 50a3bfc..3d48565 100644
--- a/chrome/browser/policy/user_policy_cache_unittest.cc
+++ b/chrome/browser/policy/user_policy_cache_unittest.cc
@@ -19,6 +19,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::BrowserThread;
using testing::_;
namespace policy {
diff --git a/chrome/browser/policy/user_policy_disk_cache.cc b/chrome/browser/policy/user_policy_disk_cache.cc
index efb8734..dc0ab0f 100644
--- a/chrome/browser/policy/user_policy_disk_cache.cc
+++ b/chrome/browser/policy/user_policy_disk_cache.cc
@@ -12,6 +12,8 @@
#include "chrome/browser/policy/proto/device_management_local.pb.h"
#include "content/public/browser/browser_thread.h"
+using content::BrowserThread;
+
namespace {
// Other places can sample on the same UMA counter, so make sure they all do
diff --git a/chrome/browser/policy/user_policy_token_cache.cc b/chrome/browser/policy/user_policy_token_cache.cc
index dab3302..64ab1d7 100644
--- a/chrome/browser/policy/user_policy_token_cache.cc
+++ b/chrome/browser/policy/user_policy_token_cache.cc
@@ -11,6 +11,8 @@
#include "chrome/browser/policy/proto/device_management_local.pb.h"
#include "content/public/browser/browser_thread.h"
+using content::BrowserThread;
+
namespace {
// Other places can sample on the same UMA counter, so make sure they all do