Index: extensions/browser/preload_check_test_util.h |
diff --git a/extensions/browser/preload_check_test_util.h b/extensions/browser/preload_check_test_util.h |
index 025ef83099a02e0cd4d0c262753383f0a8658feb..d55a4b8cd255e69c1d81ed12ff35f4e2d88e7049 100644 |
--- a/extensions/browser/preload_check_test_util.h |
+++ b/extensions/browser/preload_check_test_util.h |
@@ -29,13 +29,13 @@ class PreloadCheckRunner { |
// Starts the check and waits for its callback to execute. |
void RunUntilComplete(PreloadCheck* check); |
- // Runs the message loop until OnCheckComplete is called. |
- void WaitForCompletion(); |
- |
// Runs the message loop until idle. Useful to see whether OnCheckComplete is |
// called without waiting indefinitely. |
void WaitForIdle(); |
+ // Runs the message loop until OnCheckComplete is called. |
+ void WaitForComplete(); |
+ |
PreloadCheck::ResultCallback GetCallback(); |
const PreloadCheck::Errors& errors() const { return errors_; } |
@@ -56,15 +56,16 @@ class PreloadCheckRunner { |
// Stub for a PreloadCheck that returns the desired error(s). |
class PreloadCheckStub : public PreloadCheck { |
public: |
- explicit PreloadCheckStub(bool is_async = false); |
+ PreloadCheckStub(bool is_async = false, const Errors& errors = Errors()); |
~PreloadCheckStub() override; |
void AddError(Error error); |
void set_error_message(const base::string16& message) { message_ = message; } |
+ bool started() const { return started_; } |
// PreloadCheck: |
void Start(ResultCallback callback) override; |
- base::string16 GetErrorMessage() const override; |
+ // base::string16 GetErrorMessage() const override; |
private: |
void StartInternal(ResultCallback callback); |
@@ -72,6 +73,7 @@ class PreloadCheckStub : public PreloadCheck { |
bool is_async_; |
Errors errors_; |
base::string16 message_; |
+ bool started_; |
DISALLOW_COPY_AND_ASSIGN(PreloadCheckStub); |
}; |