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
/
chrome
/
browser
/
extensions
/
api
/
web_request
/
web_request_permissions_unittest.cc
diff --git
a/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
b/src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index
98c4f1f
..
96279af
100644
(file)
--- a/
src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/
src/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@
-29,7
+29,7
@@
class ExtensionWebRequestHelpersTestWithThreadsTest : public testing::Test {
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
protected:
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
protected:
- v
irtual void SetUp() OVERRIDE
;
+ v
oid SetUp() override
;
protected:
net::TestURLRequestContext context;
protected:
net::TestURLRequestContext context;
@@
-77,7
+77,7
@@
void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
net::TestURLRequestContext context;
TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
net::TestURLRequestContext context;
- const char* sensitive_urls[] = {
+ const char*
const
sensitive_urls[] = {
"http://clients2.google.com",
"http://clients22.google.com",
"https://clients2.google.com",
"http://clients2.google.com",
"http://clients22.google.com",
"https://clients2.google.com",
@@
-92,7
+92,7
@@
TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
"https://chrome.google.com/webstore/"
"inlineinstall/detail/kcnhkahnjcbndmmehfkdnkjomaanaooo"
};
"https://chrome.google.com/webstore/"
"inlineinstall/detail/kcnhkahnjcbndmmehfkdnkjomaanaooo"
};
- const char* non_sensitive_urls[] = {
+ const char*
const
non_sensitive_urls[] = {
"http://www.google.com/"
};
const int kSigninProcessId = 99;
"http://www.google.com/"
};
const int kSigninProcessId = 99;