summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorskrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 16:25:59 +0000
committerskrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-11 16:25:59 +0000
commitac09d34f5fa007f6a25c28641615f40e9a73cdb3 (patch)
treea84215f48b519ba82656d1be00df44b86c73e5d3 /chrome/test
parentb90bec830acb5597d6fad649310cada4a87cfa62 (diff)
downloadchromium_src-ac09d34f5fa007f6a25c28641615f40e9a73cdb3.zip
chromium_src-ac09d34f5fa007f6a25c28641615f40e9a73cdb3.tar.gz
chromium_src-ac09d34f5fa007f6a25c28641615f40e9a73cdb3.tar.bz2
Refactor synchronous error handling
This is the first of hopefully only two changes to improve our error handling situation. This change changes the way we use OnUnrecoverableError -- previously this was called whenever there was some kind of error in the MA or CP, but now it is only used for asynchronous errors. It has been removed from synchronous methods in favor of boolean return values to report errors. This simplifies some of the error handling. The next step is to make sure asynchronous usage of OnUnrecoverableError actually works as it should. Review URL: http://codereview.chromium.org/778002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/profile_mock.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/chrome/test/profile_mock.h b/chrome/test/profile_mock.h
new file mode 100644
index 0000000..c85a1ca
--- /dev/null
+++ b/chrome/test/profile_mock.h
@@ -0,0 +1,18 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_TEST_PROFILE_MOCK_H__
+#define CHROME_TEST_PROFILE_MOCK_H__
+
+#include "chrome/test/testing_profile.h"
+
+#include "testing/gmock/include/gmock/gmock.h"
+
+class ProfileMock : public TestingProfile {
+ public:
+ MOCK_METHOD0(GetBookmarkModel, BookmarkModel*());
+ MOCK_METHOD1(GetWebDataService, WebDataService*(ServiceAccessType access));
+};
+
+#endif // CHROME_TEST_PROFILE_MOCK_H__