projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
extensions
/
browser
/
test_extension_registry_observer.cc
diff --git
a/src/extensions/browser/test_extension_registry_observer.cc
b/src/extensions/browser/test_extension_registry_observer.cc
index
d9a1575
..
4d87e94
100644
(file)
--- a/
src/extensions/browser/test_extension_registry_observer.cc
+++ b/
src/extensions/browser/test_extension_registry_observer.cc
@@
-4,36
+4,29
@@
#include "extensions/browser/test_extension_registry_observer.h"
#include "extensions/browser/test_extension_registry_observer.h"
-#include "
content/public/test/test_utils
.h"
+#include "
base/run_loop
.h"
#include "extensions/browser/extension_registry.h"
namespace extensions {
class TestExtensionRegistryObserver::Waiter {
public:
#include "extensions/browser/extension_registry.h"
namespace extensions {
class TestExtensionRegistryObserver::Waiter {
public:
- explicit Waiter(const std::string& extension_id)
- : observed_(false), runner_(NULL) {}
+ explicit Waiter(const std::string& extension_id) : observed_(false) {}
void Wait() {
if (observed_)
return;
void Wait() {
if (observed_)
return;
-
- runner_ = new content::MessageLoopRunner();
- runner_->Run();
+ run_loop_.Run();
}
void OnObserved() {
observed_ = true;
}
void OnObserved() {
observed_ = true;
-
- if (runner_.get()) {
- runner_->Quit();
- runner_ = NULL;
- }
+ run_loop_.Quit();
}
private:
bool observed_;
}
private:
bool observed_;
-
scoped_refptr<content::MessageLoopRunner> runner
_;
+
base::RunLoop run_loop
_;
DISALLOW_COPY_AND_ASSIGN(Waiter);
};
DISALLOW_COPY_AND_ASSIGN(Waiter);
};