summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:05:43 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:05:43 +0000
commite0b9dda356e5f43cb8cf0d0b617bb029f44ea96d (patch)
tree11caebc4a96888ccb99aba8871694b3f01b374d2 /webkit/tools
parenteb72af63b5e933bb48bddbf63a3db76cef64ee70 (diff)
downloadchromium_src-e0b9dda356e5f43cb8cf0d0b617bb029f44ea96d.zip
chromium_src-e0b9dda356e5f43cb8cf0d0b617bb029f44ea96d.tar.gz
chromium_src-e0b9dda356e5f43cb8cf0d0b617bb029f44ea96d.tar.bz2
webkit: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details. BUG=234765 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/14307012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_appcache_system.cc6
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_client.cc2
-rw-r--r--webkit/tools/test_shell/test_shell_request_context.cc4
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc2
-rw-r--r--webkit/tools/test_shell/webwidget_host_mac.mm2
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc2
7 files changed, 9 insertions, 11 deletions
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index bacda10..39f71e3 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -362,10 +362,8 @@ SimpleAppCacheSystem* SimpleAppCacheSystem::instance_ = NULL;
SimpleAppCacheSystem::SimpleAppCacheSystem()
: io_message_loop_(NULL), ui_message_loop_(NULL),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- backend_proxy_(new SimpleBackendProxy(this))),
- ALLOW_THIS_IN_INITIALIZER_LIST(
- frontend_proxy_(new SimpleFrontendProxy(this))),
+ backend_proxy_(new SimpleBackendProxy(this)),
+ frontend_proxy_(new SimpleFrontendProxy(this)),
backend_impl_(NULL), service_(NULL), db_thread_("AppCacheDBThread") {
DCHECK(!instance_);
instance_ = this;
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index e4ae508..54e6825 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -42,7 +42,7 @@ class WebKitClientMessageLoopImpl
} // namespace
TestShellDevToolsAgent::TestShellDevToolsAgent()
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
dev_tools_client_(NULL) {
static int dev_tools_agent_counter;
routing_id_ = ++dev_tools_agent_counter;
diff --git a/webkit/tools/test_shell/test_shell_devtools_client.cc b/webkit/tools/test_shell/test_shell_devtools_client.cc
index 24396ac..7ded3e9 100644
--- a/webkit/tools/test_shell/test_shell_devtools_client.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_client.cc
@@ -26,7 +26,7 @@ using WebKit::WebView;
TestShellDevToolsClient::TestShellDevToolsClient(TestShellDevToolsAgent *agent,
WebView* web_view)
- : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
+ : weak_factory_(this),
dev_tools_agent_(agent),
web_view_(web_view) {
web_tools_frontend_.reset(WebDevToolsFrontend::create(web_view_, this,
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 201564d..014ba65 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -54,7 +54,7 @@ class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings {
};
TestShellRequestContext::TestShellRequestContext()
- : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+ : storage_(this) {
Init(base::FilePath(), net::HttpCache::NORMAL, false);
}
@@ -62,7 +62,7 @@ TestShellRequestContext::TestShellRequestContext(
const base::FilePath& cache_path,
net::HttpCache::Mode cache_mode,
bool no_proxy)
- : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
+ : storage_(this) {
Init(cache_path, cache_mode, no_proxy);
}
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index 6889065..0807d53 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -328,7 +328,7 @@ WebWidgetHost::WebWidgetHost()
webwidget_(NULL),
scroll_dx_(0),
scroll_dy_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
set_painting(false);
}
diff --git a/webkit/tools/test_shell/webwidget_host_mac.mm b/webkit/tools/test_shell/webwidget_host_mac.mm
index da34024..d96da26 100644
--- a/webkit/tools/test_shell/webwidget_host_mac.mm
+++ b/webkit/tools/test_shell/webwidget_host_mac.mm
@@ -150,7 +150,7 @@ WebWidgetHost::WebWidgetHost()
webwidget_(NULL),
scroll_dx_(0),
scroll_dy_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
set_painting(false);
}
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index 472e437..4df7da0 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -200,7 +200,7 @@ WebWidgetHost::WebWidgetHost()
track_mouse_leave_(false),
scroll_dx_(0),
scroll_dy_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
set_painting(false);
}