Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3522)

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index f52752f4eb7e278f69f037b6a4d1be1674f95aa1..0e58bdcd2c10156fab3a01efd022a76169340b86 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -186,7 +186,7 @@ class ExtensionWebRequestTest : public testing::Test {
new ChromeNetworkDelegate(event_router_.get(), &enable_referrers_));
network_delegate_->set_profile(&profile_);
network_delegate_->set_cookie_settings(
- CookieSettings::Factory::GetForProfile(&profile_));
+ CookieSettings::Factory::GetForProfile(&profile_).get());
context_.reset(new net::TestURLRequestContext(true));
context_->set_network_delegate(network_delegate_.get());
context_->Init();
@@ -504,10 +504,14 @@ void ExtensionWebRequestTest::FireURLRequestWithData(
ScopedVector<net::UploadElementReader> element_readers;
element_readers.push_back(new net::UploadBytesElementReader(
&(bytes_1[0]), bytes_1.size()));
- element_readers.push_back(new net::UploadFileElementReader(
- base::MessageLoopProxy::current(), base::FilePath(), 0, 0, base::Time()));
- element_readers.push_back(new net::UploadBytesElementReader(
- &(bytes_2[0]), bytes_2.size()));
+ element_readers.push_back(
+ new net::UploadFileElementReader(base::MessageLoopProxy::current().get(),
+ base::FilePath(),
+ 0,
+ 0,
+ base::Time()));
+ element_readers.push_back(
+ new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size()));
request.set_upload(make_scoped_ptr(
new net::UploadDataStream(&element_readers, 0)));
ipc_sender_.PushTask(base::Bind(&base::DoNothing));
@@ -778,7 +782,7 @@ class ExtensionWebRequestHeaderModificationTest
new ChromeNetworkDelegate(event_router_.get(), &enable_referrers_));
network_delegate_->set_profile(&profile_);
network_delegate_->set_cookie_settings(
- CookieSettings::Factory::GetForProfile(&profile_));
+ CookieSettings::Factory::GetForProfile(&profile_).get());
context_.reset(new net::TestURLRequestContext(true));
host_resolver_.reset(new net::MockHostResolver());
host_resolver_->rules()->AddSimulatedFailure("doesnotexist");
« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_api.cc ('k') | chrome/browser/extensions/app_sync_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698