summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 20:02:01 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-26 20:02:01 +0000
commit1e0b6b8607c519c1fdbcaf303448c81e903c7177 (patch)
tree73d737fab84578f8344c9ff25ce3fe7287c4e3b4 /google_apis
parentac60536e1378b3005629fd1167fef96142415fd2 (diff)
downloadchromium_src-1e0b6b8607c519c1fdbcaf303448c81e903c7177.zip
chromium_src-1e0b6b8607c519c1fdbcaf303448c81e903c7177.tar.gz
chromium_src-1e0b6b8607c519c1fdbcaf303448c81e903c7177.tar.bz2
google_apis: 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 Review URL: https://codereview.chromium.org/14113028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gaia/gaia_oauth_client_unittest.cc2
-rw-r--r--google_apis/gaia/mock_url_fetcher_factory.h2
-rw-r--r--google_apis/gaia/oauth2_access_token_fetcher_unittest.cc2
-rw-r--r--google_apis/gaia/oauth2_api_call_flow_unittest.cc2
-rw-r--r--google_apis/gaia/oauth2_mint_token_flow.cc2
5 files changed, 5 insertions, 5 deletions
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 9c87a16..79a8d30 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -68,7 +68,7 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory,
public net::ScopedURLFetcherFactory {
public:
MockOAuthFetcherFactory()
- : net::ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : net::ScopedURLFetcherFactory(this),
response_code_(net::HTTP_OK) {
}
virtual ~MockOAuthFetcherFactory() {}
diff --git a/google_apis/gaia/mock_url_fetcher_factory.h b/google_apis/gaia/mock_url_fetcher_factory.h
index d765219..862f220 100644
--- a/google_apis/gaia/mock_url_fetcher_factory.h
+++ b/google_apis/gaia/mock_url_fetcher_factory.h
@@ -44,7 +44,7 @@ class MockURLFetcherFactory : public net::URLFetcherFactory,
public net::ScopedURLFetcherFactory {
public:
MockURLFetcherFactory()
- : net::ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ : net::ScopedURLFetcherFactory(this),
success_(true) {
}
~MockURLFetcherFactory() {}
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
index 7c761c7..60e0ea3 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
@@ -56,7 +56,7 @@ class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
public URLFetcherFactory {
public:
MockUrlFetcherFactory()
- : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ : ScopedURLFetcherFactory(this) {
}
virtual ~MockUrlFetcherFactory() {}
diff --git a/google_apis/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
index 4e8692e..2c2f33a 100644
--- a/google_apis/gaia/oauth2_api_call_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
@@ -57,7 +57,7 @@ class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
public URLFetcherFactory {
public:
MockUrlFetcherFactory()
- : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ : ScopedURLFetcherFactory(this) {
}
virtual ~MockUrlFetcherFactory() {}
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc
index 9c5d943..3aee16d 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow.cc
@@ -100,7 +100,7 @@ OAuth2MintTokenFlow::OAuth2MintTokenFlow(URLRequestContextGetter* context,
std::vector<std::string>()),
delegate_(delegate),
parameters_(parameters),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
+ weak_factory_(this) {}
OAuth2MintTokenFlow::~OAuth2MintTokenFlow() { }