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
/
google_apis
/
drive
/
base_requests_unittest.cc
diff --git
a/src/google_apis/drive/base_requests_unittest.cc
b/src/google_apis/drive/base_requests_unittest.cc
index
11f887c
..
e4e918b
100644
(file)
--- a/
src/google_apis/drive/base_requests_unittest.cc
+++ b/
src/google_apis/drive/base_requests_unittest.cc
@@
-35,15
+35,14
@@
class FakeUrlFetchRequest : public UrlFetchRequestBase {
url_(url) {
}
url_(url) {
}
- virtual ~FakeUrlFetchRequest() {
- }
+ ~FakeUrlFetchRequest() override {}
protected:
protected:
-
virtual GURL GetURL() const OVERRIDE
{ return url_; }
- v
irtual void ProcessURLFetchResults(const net::URLFetcher* source) OVERRIDE
{
+
GURL GetURL() const override
{ return url_; }
+ v
oid ProcessURLFetchResults(const net::URLFetcher* source) override
{
callback_.Run(GetErrorCode());
}
callback_.Run(GetErrorCode());
}
- v
irtual void RunCallbackOnPrematureFailure(GDataErrorCode code) OVERRIDE
{
+ v
oid RunCallbackOnPrematureFailure(GDataErrorCode code) override
{
callback_.Run(code);
}
callback_.Run(code);
}
@@
-57,7
+56,7
@@
class BaseRequestsTest : public testing::Test {
public:
BaseRequestsTest() : response_code_(net::HTTP_OK) {}
public:
BaseRequestsTest() : response_code_(net::HTTP_OK) {}
- virtual void SetUp()
OVERRIDE
{
+ virtual void SetUp()
override
{
request_context_getter_ = new net::TestURLRequestContextGetter(
message_loop_.message_loop_proxy());
request_context_getter_ = new net::TestURLRequestContextGetter(
message_loop_.message_loop_proxy());
@@
-78,7
+77,7
@@
class BaseRequestsTest : public testing::Test {
response->set_code(response_code_);
response->set_content(response_body_);
response->set_content_type("application/json");
response->set_code(response_code_);
response->set_content(response_body_);
response->set_content_type("application/json");
- return response.Pass
As<net::test_server::HttpResponse>
();
+ return response.Pass();
}
base::MessageLoopForIO message_loop_;
}
base::MessageLoopForIO message_loop_;