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
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
plugins
/
npapi_infobar_browsertest.cc
diff --git
a/src/chrome/browser/plugins/npapi_infobar_browsertest.cc
b/src/chrome/browser/plugins/npapi_infobar_browsertest.cc
index
a0dd6ab
..
4505c55
100644
(file)
--- a/
src/chrome/browser/plugins/npapi_infobar_browsertest.cc
+++ b/
src/chrome/browser/plugins/npapi_infobar_browsertest.cc
@@
-5,6
+5,7
@@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
#include "base/metrics/field_trial.h"
#include "base/path_service.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "base/metrics/field_trial.h"
#include "base/path_service.h"
#include "chrome/browser/infobars/infobar_service.h"
@@
-20,12
+21,11
@@
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_utils.h"
-#include "
content/test/ne
t/url_request_mock_http_job.h"
+#include "
net/test/url_reques
t/url_request_mock_http_job.h"
#include "url/gurl.h"
using content::BrowserThread;
#include "url/gurl.h"
using content::BrowserThread;
-using content::URLRequestMockHTTPJob;
-
+using net::URLRequestMockHTTPJob;
namespace {
namespace {
@@
-45,8
+45,11
@@
class UnauthorizedPluginInfoBarBrowserTest : public InProcessBrowserTest {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
BrowserThread::PostTaskAndReply(
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
BrowserThread::PostTaskAndReply(
- BrowserThread::IO, FROM_HERE,
- base::Bind(URLRequestMockHTTPJob::AddUrlHandler, root_http),
+ BrowserThread::IO,
+ FROM_HERE,
+ base::Bind(URLRequestMockHTTPJob::AddUrlHandler,
+ root_http,
+ make_scoped_refptr(BrowserThread::GetBlockingPool())),
runner->QuitClosure());
runner->Run();
}
runner->QuitClosure());
runner->Run();
}