Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2464)

Unified Diff: chrome/browser/policy/asynchronous_policy_test_base.h

Issue 6413036: Another big out-of-lining of test code. Hits a lot of gmock objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: lei comments Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/asynchronous_policy_test_base.h
diff --git a/chrome/browser/policy/asynchronous_policy_test_base.h b/chrome/browser/policy/asynchronous_policy_test_base.h
index 0281afdc7df90f8c6d472037bf3d67d36b264075..f567f63228f22f075e85e22df5be617b21e10568 100644
--- a/chrome/browser/policy/asynchronous_policy_test_base.h
+++ b/chrome/browser/policy/asynchronous_policy_test_base.h
@@ -9,17 +9,18 @@
#include "base/message_loop.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/policy/asynchronous_policy_provider.h"
-#include "chrome/browser/policy/mock_configuration_policy_store.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace policy {
+class MockConfigurationPolicyStore;
+
// A delegate for testing that can feed arbitrary information to the loader.
class ProviderDelegateMock : public AsynchronousPolicyProvider::Delegate {
public:
- ProviderDelegateMock() : AsynchronousPolicyProvider::Delegate() {}
- virtual ~ProviderDelegateMock() {}
+ ProviderDelegateMock();
+ virtual ~ProviderDelegateMock();
MOCK_METHOD0(Load, DictionaryValue*());
@@ -29,20 +30,12 @@ class ProviderDelegateMock : public AsynchronousPolicyProvider::Delegate {
class AsynchronousPolicyTestBase : public testing::Test {
public:
- AsynchronousPolicyTestBase()
- : ui_thread_(BrowserThread::UI, &loop_),
- file_thread_(BrowserThread::FILE, &loop_) {}
-
- virtual ~AsynchronousPolicyTestBase() {}
-
- virtual void SetUp() {
- delegate_.reset(new ProviderDelegateMock());
- store_.reset(new MockConfigurationPolicyStore);
- }
+ AsynchronousPolicyTestBase();
+ virtual ~AsynchronousPolicyTestBase();
- virtual void TearDown() {
- loop_.RunAllPending();
- }
+ // testing::Test:
+ virtual void SetUp();
+ virtual void TearDown();
protected:
MessageLoop loop_;
« no previous file with comments | « chrome/browser/policy/asynchronous_policy_loader_unittest.cc ('k') | chrome/browser/policy/asynchronous_policy_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698