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

Unified Diff: chrome/browser/interests/interests_fetcher.cc

Issue 1396443002: Add the JNI code in order to let Java use the InterestsFetcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/interests/interests_fetcher.cc
diff --git a/chrome/browser/interests/interests_fetcher.cc b/chrome/browser/interests/interests_fetcher.cc
index 5096af2ae0dda26cc81d48a34ce1b730503f9d2b..40fa204fae5ce5d4a0468f8606cb0b61f1d6da7f 100644
--- a/chrome/browser/interests/interests_fetcher.cc
+++ b/chrome/browser/interests/interests_fetcher.cc
@@ -31,10 +31,6 @@ const char kApiScope[] = "https://www.googleapis.com/auth/googlenow";
const char kAuthorizationHeaderFormat[] = "Authorization: Bearer %s";
-std::vector<InterestsFetcher::Interest> EmptyResponse() {
- return std::vector<InterestsFetcher::Interest>();
-}
-
GURL GetInterestsURL() {
const base::CommandLine* command_line =
base::CommandLine::ForCurrentProcess();
@@ -93,7 +89,7 @@ void InterestsFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
const net::URLRequestStatus& status = source->GetStatus();
if (!status.is_success()) {
VLOG(2) << "Network error " << status.error();
- callback_.Run(EmptyResponse());
+ callback_.Run(nullptr);
return;
}
@@ -110,7 +106,7 @@ void InterestsFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
if (response_code != net::HTTP_OK) {
VLOG(2) << "HTTP error " << response_code;
- callback_.Run(EmptyResponse());
+ callback_.Run(nullptr);
return;
}
@@ -143,7 +139,7 @@ void InterestsFetcher::OnGetTokenFailure(
const GoogleServiceAuthError& error) {
DLOG(WARNING) << error.ToString();
- callback_.Run(EmptyResponse());
+ callback_.Run(nullptr);
}
void InterestsFetcher::StartOAuth2Request() {
@@ -162,24 +158,24 @@ scoped_ptr<net::URLFetcher> InterestsFetcher::CreateFetcher() {
net::URLFetcher::Create(0, GetInterestsURL(), net::URLFetcher::GET, this);
}
-std::vector<InterestsFetcher::Interest> InterestsFetcher::ExtractInterests(
- const std::string& response) {
+scoped_ptr<std::vector<InterestsFetcher::Interest>>
+InterestsFetcher::ExtractInterests(const std::string& response) {
scoped_ptr<base::Value> value = base::JSONReader::Read(response);
DVLOG(2) << response;
const base::DictionaryValue* dict = nullptr;
if (!value || !value->GetAsDictionary(&dict)) {
DLOG(WARNING) << "Failed to parse global dictionary.";
- return EmptyResponse();
+ return nullptr;
}
const base::ListValue* interests_list = nullptr;
if (!dict->GetList(kIdInterests, &interests_list)) {
DLOG(WARNING) << "Failed to parse interests list.";
- return EmptyResponse();
+ return nullptr;
}
- std::vector<Interest> res;
+ scoped_ptr<std::vector<Interest>> res(new std::vector<Interest>());
for (const base::Value* entry : *interests_list) {
const base::DictionaryValue* interest_dict = nullptr;
if (!entry->GetAsDictionary(&interest_dict)) {
@@ -207,7 +203,7 @@ std::vector<InterestsFetcher::Interest> InterestsFetcher::ExtractInterests(
continue;
}
- res.push_back(Interest{name, GURL(image_url), relevance});
+ res->push_back(Interest{name, GURL(image_url), relevance});
}
return res;
« no previous file with comments | « chrome/browser/interests/interests_fetcher.h ('k') | chrome/browser/interests/interests_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698