summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 00:52:02 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-19 00:52:02 +0000
commit375aaee8262cc6a6502447f59668aa91d05274fb (patch)
treebe5fabff88035c7db2e0925dae76c53eb65059d4 /chrome/test
parentc4b34163c0745d698d1960c1cab65e1e101d9eec (diff)
downloadchromium_src-375aaee8262cc6a6502447f59668aa91d05274fb.zip
chromium_src-375aaee8262cc6a6502447f59668aa91d05274fb.tar.gz
chromium_src-375aaee8262cc6a6502447f59668aa91d05274fb.tar.bz2
Combine similar code from sync unit tests and add additional unit tests for typed url syncing.
BUG=none TEST=run unit tests Review URL: http://codereview.chromium.org/1124002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/profile_mock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/profile_mock.h b/chrome/test/profile_mock.h
index 388d282..11401ea 100644
--- a/chrome/test/profile_mock.h
+++ b/chrome/test/profile_mock.h
@@ -12,9 +12,9 @@
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*());
+ MOCK_METHOD1(GetWebDataService, WebDataService*(ServiceAccessType access));
};
#endif // CHROME_TEST_PROFILE_MOCK_H__