summaryrefslogtreecommitdiffstats
path: root/chrome/browser/policy/asynchronous_policy_test_base.h
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 10:08:16 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-10 10:08:16 +0000
commitb779909d264c992707a12c63d209b99f0b9acb53 (patch)
tree1b9b42be4082af222f9a54d28814c21e943bc613 /chrome/browser/policy/asynchronous_policy_test_base.h
parentc5d094f0ad57ec224e3780f5171a555486b5e1ef (diff)
downloadchromium_src-b779909d264c992707a12c63d209b99f0b9acb53.zip
chromium_src-b779909d264c992707a12c63d209b99f0b9acb53.tar.gz
chromium_src-b779909d264c992707a12c63d209b99f0b9acb53.tar.bz2
Include only policy definitions that apply to the platfrom in the policy definition list.
BUG=chromium-os:19411 TEST=compiles, unit tests pass. Review URL: http://codereview.chromium.org/8467011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy/asynchronous_policy_test_base.h')
-rw-r--r--chrome/browser/policy/asynchronous_policy_test_base.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.h b/chrome/browser/policy/asynchronous_policy_test_base.h
index 7e11d29..7771490 100644
--- a/chrome/browser/policy/asynchronous_policy_test_base.h
+++ b/chrome/browser/policy/asynchronous_policy_test_base.h
@@ -34,15 +34,11 @@ class AsynchronousPolicyTestBase : public testing::Test {
virtual ~AsynchronousPolicyTestBase();
// testing::Test:
- virtual void SetUp();
virtual void TearDown();
protected:
- MessageLoop loop_;
-
- // The mocks that are used in the test must outlive the scope of the test
- // because they still get accessed in the RunAllPending of the TearDown.
- scoped_ptr<ProviderDelegateMock> delegate_;
+ // Create an actual IO loop (needed by FilePathWatcher).
+ MessageLoopForIO loop_;
private:
content::TestBrowserThread ui_thread_;