summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:27:29 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-18 00:27:29 +0000
commit5315025a1176b7f077b4bf8d2a963e63ea87f988 (patch)
tree32383a62a01d8609f0be2e01fd3be5fd4b9895cf /chrome/test
parent7a1c45fe4cb3c4abdd85aa09fa12886ca2fc7be8 (diff)
downloadchromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.zip
chromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.tar.gz
chromium_src-5315025a1176b7f077b4bf8d2a963e63ea87f988.tar.bz2
Update sync to support syncing of typed urls
Review URL: http://codereview.chromium.org/896001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/profile_mock.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/profile_mock.h b/chrome/test/profile_mock.h
index c85a1ca..388d282 100644
--- a/chrome/test/profile_mock.h
+++ b/chrome/test/profile_mock.h
@@ -13,6 +13,8 @@ class ProfileMock : public TestingProfile {
public:
MOCK_METHOD0(GetBookmarkModel, BookmarkModel*());
MOCK_METHOD1(GetWebDataService, WebDataService*(ServiceAccessType access));
+ MOCK_METHOD1(GetHistoryService, HistoryService*(ServiceAccessType access));
+ MOCK_METHOD0(GetHistoryServiceWithoutCreating, HistoryService*());
};
#endif // CHROME_TEST_PROFILE_MOCK_H__