diff options
Diffstat (limited to 'chrome/browser/extensions')
11 files changed, 140 insertions, 166 deletions
diff --git a/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.cc b/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.cc index ab944b2..b40895c 100644 --- a/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.cc +++ b/chrome/browser/extensions/api/cast_devices_private/cast_devices_private_api.cc @@ -93,10 +93,10 @@ CastDevicesPrivateUpdateDevicesFunction::Run() { api::cast_devices_private::UpdateDevices::Params::Create(*args_); CastDeviceUpdateListeners::ReceiverAndActivityList devices; - for (linked_ptr<api::cast_devices_private::ReceiverActivity> device : + for (const api::cast_devices_private::ReceiverActivity& device : params->devices) { - devices.push_back(ConvertReceiverAndActivityType(device->receiver, - device->activity.get())); + devices.push_back( + ConvertReceiverAndActivityType(device.receiver, device.activity.get())); } auto listeners = CastDeviceUpdateListeners::Get(browser_context()); diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc index 98c9627..a4f4c3e 100644 --- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc +++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc @@ -10,7 +10,6 @@ #include <vector> #include "base/logging.h" -#include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h" #include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h" @@ -59,14 +58,13 @@ CertificateProviderInternalReportCertificatesFunction::Run() { chromeos::certificate_provider::CertificateInfoList cert_infos; std::vector<std::vector<char>> rejected_certificates; - for (linked_ptr<api_cp::CertificateInfo> input_cert_info : - *params->certificates) { + for (const api_cp::CertificateInfo& input_cert_info : *params->certificates) { chromeos::certificate_provider::CertificateInfo parsed_cert_info; - if (ParseCertificateInfo(*input_cert_info, &parsed_cert_info)) + if (ParseCertificateInfo(input_cert_info, &parsed_cert_info)) cert_infos.push_back(parsed_cert_info); else - rejected_certificates.push_back(input_cert_info->certificate); + rejected_certificates.push_back(input_cert_info.certificate); } if (service->SetCertificatesProvidedByExtension( diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc index 47dc897..7e44909 100644 --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_apitest.cc @@ -79,12 +79,11 @@ class CloudPrintTestsDelegateMock : public extensions::CloudPrintTestsDelegate { MATCHER(IsExpectedUserSettings, "") { const UserSettings& settings = arg; - return settings.connect_new_printers && - settings.printers.size() == 2 && - settings.printers[0]->name == "printer1" && - !settings.printers[0]->connect && - settings.printers[1]->name == "printer2" && - settings.printers[1]->connect; + return settings.connect_new_printers && settings.printers.size() == 2 && + settings.printers[0].name == "printer1" && + !settings.printers[0].connect && + settings.printers[1].name == "printer2" && + settings.printers[1].connect; } // http://crbug.com/177163 diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index 85418ac..3485bb8 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -143,9 +143,9 @@ void CookiesEventRouter::CookieChanged( base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetBoolean(keys::kRemovedKey, details->removed); - scoped_ptr<cookies::Cookie> cookie(cookies_helpers::CreateCookie( - *details->cookie, cookies_helpers::GetStoreIdFromProfile(profile))); - dict->Set(keys::kCookieKey, cookie->ToValue().release()); + cookies::Cookie cookie = cookies_helpers::CreateCookie( + *details->cookie, cookies_helpers::GetStoreIdFromProfile(profile)); + dict->Set(keys::kCookieKey, cookie.ToValue()); // Map the internal cause to an external string. std::string cause; @@ -243,21 +243,20 @@ void CookiesGetFunction::GetCookieOnIOThread() { } void CookiesGetFunction::GetCookieCallback(const net::CookieList& cookie_list) { - net::CookieList::const_iterator it; - for (it = cookie_list.begin(); it != cookie_list.end(); ++it) { + for (const net::CanonicalCookie& cookie : cookie_list) { // Return the first matching cookie. Relies on the fact that the // CookieMonster returns them in canonical order (longest path, then // earliest creation time). - if (it->Name() == parsed_args_->details.name) { - scoped_ptr<cookies::Cookie> cookie( - cookies_helpers::CreateCookie(*it, *parsed_args_->details.store_id)); - results_ = Get::Results::Create(*cookie); + if (cookie.Name() == parsed_args_->details.name) { + cookies::Cookie api_cookie = cookies_helpers::CreateCookie( + cookie, *parsed_args_->details.store_id); + results_ = Get::Results::Create(api_cookie); break; } } // The cookie doesn't exist; return null. - if (it == cookie_list.end()) + if (!results_) SetResult(base::Value::CreateNullValue()); bool rv = BrowserThread::PostTask( @@ -317,7 +316,7 @@ void CookiesGetAllFunction::GetAllCookiesOnIOThread() { void CookiesGetAllFunction::GetAllCookiesCallback( const net::CookieList& cookie_list) { if (extension()) { - std::vector<linked_ptr<cookies::Cookie>> match_vector; + std::vector<cookies::Cookie> match_vector; cookies_helpers::AppendMatchingCookiesToVector( cookie_list, url_, &parsed_args_->details, extension(), &match_vector); @@ -436,18 +435,17 @@ void CookiesSetFunction::PullCookie(bool set_cookie_result) { void CookiesSetFunction::PullCookieCallback( const net::CookieList& cookie_list) { - net::CookieList::const_iterator it; - for (it = cookie_list.begin(); it != cookie_list.end(); ++it) { + for (const net::CanonicalCookie& cookie : cookie_list) { // Return the first matching cookie. Relies on the fact that the // CookieMonster returns them in canonical order (longest path, then // earliest creation time). std::string name = parsed_args_->details.name.get() ? *parsed_args_->details.name : std::string(); - if (it->Name() == name) { - scoped_ptr<cookies::Cookie> cookie( - cookies_helpers::CreateCookie(*it, *parsed_args_->details.store_id)); - results_ = Set::Results::Create(*cookie); + if (cookie.Name() == name) { + cookies::Cookie api_cookie = cookies_helpers::CreateCookie( + cookie, *parsed_args_->details.store_id); + results_ = Set::Results::Create(api_cookie); break; } } @@ -559,17 +557,15 @@ bool CookiesGetAllCookieStoresFunction::RunSync() { } } // Return a list of all cookie stores with at least one open tab. - std::vector<linked_ptr<cookies::CookieStore>> cookie_stores; + std::vector<cookies::CookieStore> cookie_stores; if (original_tab_ids->GetSize() > 0) { - cookie_stores.push_back(make_linked_ptr( - cookies_helpers::CreateCookieStore( - original_profile, original_tab_ids.release()).release())); + cookie_stores.push_back(cookies_helpers::CreateCookieStore( + original_profile, original_tab_ids.release())); } if (incognito_tab_ids.get() && incognito_tab_ids->GetSize() > 0 && incognito_profile) { - cookie_stores.push_back(make_linked_ptr( - cookies_helpers::CreateCookieStore( - incognito_profile, incognito_tab_ids.release()).release())); + cookie_stores.push_back(cookies_helpers::CreateCookieStore( + incognito_profile, incognito_tab_ids.release())); } results_ = GetAllCookieStores::Results::Create(cookie_stores); return true; diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 3ae02ac..350a5b9 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -11,8 +11,6 @@ #include <vector> #include "base/logging.h" -#include "base/memory/linked_ptr.h" -#include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" @@ -65,63 +63,62 @@ const char* GetStoreIdFromProfile(Profile* profile) { kOffTheRecordProfileStoreId : kOriginalProfileStoreId; } -scoped_ptr<Cookie> CreateCookie( - const net::CanonicalCookie& canonical_cookie, - const std::string& store_id) { - scoped_ptr<Cookie> cookie(new Cookie()); +Cookie CreateCookie(const net::CanonicalCookie& canonical_cookie, + const std::string& store_id) { + Cookie cookie; // A cookie is a raw byte sequence. By explicitly parsing it as UTF-8, we // apply error correction, so the string can be safely passed to the renderer. - cookie->name = base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Name())); - cookie->value = - base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Value())); - cookie->domain = canonical_cookie.Domain(); - cookie->host_only = net::cookie_util::DomainIsHostOnly( - canonical_cookie.Domain()); + cookie.name = base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Name())); + cookie.value = base::UTF16ToUTF8(base::UTF8ToUTF16(canonical_cookie.Value())); + cookie.domain = canonical_cookie.Domain(); + cookie.host_only = + net::cookie_util::DomainIsHostOnly(canonical_cookie.Domain()); // A non-UTF8 path is invalid, so we just replace it with an empty string. - cookie->path = base::IsStringUTF8(canonical_cookie.Path()) ? - canonical_cookie.Path() : std::string(); - cookie->secure = canonical_cookie.IsSecure(); - cookie->http_only = canonical_cookie.IsHttpOnly(); + cookie.path = base::IsStringUTF8(canonical_cookie.Path()) + ? canonical_cookie.Path() + : std::string(); + cookie.secure = canonical_cookie.IsSecure(); + cookie.http_only = canonical_cookie.IsHttpOnly(); switch (canonical_cookie.SameSite()) { case net::CookieSameSite::DEFAULT_MODE: - cookie->same_site = api::cookies::SAME_SITE_STATUS_NO_RESTRICTION; + cookie.same_site = api::cookies::SAME_SITE_STATUS_NO_RESTRICTION; break; case net::CookieSameSite::LAX_MODE: - cookie->same_site = api::cookies::SAME_SITE_STATUS_LAX; + cookie.same_site = api::cookies::SAME_SITE_STATUS_LAX; break; case net::CookieSameSite::STRICT_MODE: - cookie->same_site = api::cookies::SAME_SITE_STATUS_STRICT; + cookie.same_site = api::cookies::SAME_SITE_STATUS_STRICT; break; } - cookie->session = !canonical_cookie.IsPersistent(); + cookie.session = !canonical_cookie.IsPersistent(); if (canonical_cookie.IsPersistent()) { - cookie->expiration_date.reset( + cookie.expiration_date.reset( new double(canonical_cookie.ExpiryDate().ToDoubleT())); } - cookie->store_id = store_id; + cookie.store_id = store_id; return cookie; } -scoped_ptr<CookieStore> CreateCookieStore(Profile* profile, - base::ListValue* tab_ids) { +CookieStore CreateCookieStore(Profile* profile, base::ListValue* tab_ids) { DCHECK(profile); DCHECK(tab_ids); base::DictionaryValue dict; dict.SetString(keys::kIdKey, GetStoreIdFromProfile(profile)); dict.Set(keys::kTabIdsKey, tab_ids); - CookieStore* cookie_store = new CookieStore(); - bool rv = CookieStore::Populate(dict, cookie_store); + CookieStore cookie_store; + bool rv = CookieStore::Populate(dict, &cookie_store); CHECK(rv); - return scoped_ptr<CookieStore>(cookie_store); + return cookie_store; } void GetCookieListFromStore( - net::CookieStore* cookie_store, const GURL& url, + net::CookieStore* cookie_store, + const GURL& url, const net::CookieMonster::GetCookieListCallback& callback) { DCHECK(cookie_store); if (!url.is_empty()) { @@ -145,20 +142,17 @@ void AppendMatchingCookiesToVector(const net::CookieList& all_cookies, const GURL& url, const GetAll::Params::Details* details, const Extension* extension, - LinkedCookieVec* match_vector) { - net::CookieList::const_iterator it; - for (it = all_cookies.begin(); it != all_cookies.end(); ++it) { + std::vector<Cookie>* match_vector) { + for (const net::CanonicalCookie& cookie : all_cookies) { // Ignore any cookie whose domain doesn't match the extension's // host permissions. - GURL cookie_domain_url = GetURLFromCanonicalCookie(*it); + GURL cookie_domain_url = GetURLFromCanonicalCookie(cookie); if (!extension->permissions_data()->HasHostPermission(cookie_domain_url)) continue; // Filter the cookie using the match filter. cookies_helpers::MatchFilter filter(details); - if (filter.MatchesCookie(*it)) { - match_vector->push_back(make_linked_ptr( - CreateCookie(*it, *details->store_id).release())); - } + if (filter.MatchesCookie(cookie)) + match_vector->push_back(CreateCookie(cookie, *details->store_id)); } } diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.h b/chrome/browser/extensions/api/cookies/cookies_helpers.h index 86dd5d9..0894741 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.h +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.h @@ -13,8 +13,6 @@ #include <string> #include <vector> -#include "base/memory/linked_ptr.h" -#include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/api/cookies.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/canonical_cookie.h" @@ -37,9 +35,6 @@ class Extension; namespace cookies_helpers { -typedef std::vector<linked_ptr<extensions::api::cookies::Cookie> > - LinkedCookieVec; - // Returns either the original profile or the incognito profile, based on the // given store ID. Returns NULL if the profile doesn't exist or is not allowed // (e.g. if incognito mode is not enabled for the extension). @@ -50,23 +45,21 @@ Profile* ChooseProfileFromStoreId(const std::string& store_id, // Returns the store ID for a particular user profile. const char* GetStoreIdFromProfile(Profile* profile); -// Allocates and construct a new Cookie object representing a cookie as defined -// by the cookies API. -scoped_ptr<extensions::api::cookies::Cookie> CreateCookie( - const net::CanonicalCookie& cookie, - const std::string& store_id); +// Constructs a new Cookie object representing a cookie as defined by the +// cookies API. +api::cookies::Cookie CreateCookie(const net::CanonicalCookie& cookie, + const std::string& store_id); -// Allocates and constructs a new CookieStore object as defined by the cookies -// API. -scoped_ptr<extensions::api::cookies::CookieStore> CreateCookieStore( - Profile* profile, - base::ListValue* tab_ids); +// Constructs a new CookieStore object as defined by the cookies API. +api::cookies::CookieStore CreateCookieStore(Profile* profile, + base::ListValue* tab_ids); // Retrieves all cookies from the given cookie store corresponding to the given // URL. If the URL is empty, all cookies in the cookie store are retrieved. // This can only be called on the IO thread. void GetCookieListFromStore( - net::CookieStore* cookie_store, const GURL& url, + net::CookieStore* cookie_store, + const GURL& url, const net::CookieMonster::GetCookieListCallback& callback); // Constructs a URL from a cookie's information for use in checking @@ -80,9 +73,11 @@ GURL GetURLFromCanonicalCookie( // match vector all the cookies that both match the given URL and cookie details // and are allowed by extension host permissions. void AppendMatchingCookiesToVector( - const net::CookieList& all_cookies, const GURL& url, - const extensions::api::cookies::GetAll::Params::Details* details, - const Extension* extension, LinkedCookieVec* match_vector); + const net::CookieList& all_cookies, + const GURL& url, + const api::cookies::GetAll::Params::Details* details, + const Extension* extension, + std::vector<api::cookies::Cookie>* match_vector); // Appends the IDs of all tabs belonging to the given browser to the // given list. @@ -99,8 +94,7 @@ class MatchFilter { // Takes the details dictionary argument given by the user as input. // This class does not take ownership of the lifetime of the Details // object. - explicit MatchFilter( - const extensions::api::cookies::GetAll::Params::Details* details); + explicit MatchFilter(const api::cookies::GetAll::Params::Details* details); // Returns true if the given cookie matches the properties in the match // filter. @@ -116,7 +110,7 @@ class MatchFilter { // 'foo.bar.com', '.foo.bar.com', and 'baz.foo.bar.com'. bool MatchesDomain(const std::string& domain); - const extensions::api::cookies::GetAll::Params::Details* details_; + const api::cookies::GetAll::Params::Details* details_; }; } // namespace cookies_helpers diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc index 6ba5e14..6952519 100644 --- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc +++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc @@ -87,41 +87,39 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { GURL(), "ABC", "DEF", "www.foobar.com", "/", base::Time(), base::Time(), base::Time(), false, false, net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT); - scoped_ptr<Cookie> cookie1( - cookies_helpers::CreateCookie( - canonical_cookie1, "some cookie store")); - EXPECT_EQ("ABC", cookie1->name); - EXPECT_EQ("DEF", cookie1->value); - EXPECT_EQ("www.foobar.com", cookie1->domain); - EXPECT_TRUE(cookie1->host_only); - EXPECT_EQ("/", cookie1->path); - EXPECT_FALSE(cookie1->secure); - EXPECT_FALSE(cookie1->http_only); - EXPECT_EQ(api::cookies::SAME_SITE_STATUS_NO_RESTRICTION, cookie1->same_site); - EXPECT_TRUE(cookie1->session); - EXPECT_FALSE(cookie1->expiration_date.get()); - EXPECT_EQ("some cookie store", cookie1->store_id); + Cookie cookie1 = + cookies_helpers::CreateCookie(canonical_cookie1, "some cookie store"); + EXPECT_EQ("ABC", cookie1.name); + EXPECT_EQ("DEF", cookie1.value); + EXPECT_EQ("www.foobar.com", cookie1.domain); + EXPECT_TRUE(cookie1.host_only); + EXPECT_EQ("/", cookie1.path); + EXPECT_FALSE(cookie1.secure); + EXPECT_FALSE(cookie1.http_only); + EXPECT_EQ(api::cookies::SAME_SITE_STATUS_NO_RESTRICTION, cookie1.same_site); + EXPECT_TRUE(cookie1.session); + EXPECT_FALSE(cookie1.expiration_date.get()); + EXPECT_EQ("some cookie store", cookie1.store_id); net::CanonicalCookie canonical_cookie2( GURL(), "ABC", "DEF", ".foobar.com", "/", base::Time(), base::Time::FromDoubleT(10000), base::Time(), false, false, net::CookieSameSite::STRICT_MODE, net::COOKIE_PRIORITY_DEFAULT); - scoped_ptr<Cookie> cookie2( - cookies_helpers::CreateCookie( - canonical_cookie2, "some cookie store")); - EXPECT_FALSE(cookie2->host_only); - EXPECT_FALSE(cookie2->session); - EXPECT_EQ(api::cookies::SAME_SITE_STATUS_STRICT, cookie2->same_site); - ASSERT_TRUE(cookie2->expiration_date.get()); - EXPECT_EQ(10000, *cookie2->expiration_date); + Cookie cookie2 = + cookies_helpers::CreateCookie(canonical_cookie2, "some cookie store"); + EXPECT_FALSE(cookie2.host_only); + EXPECT_FALSE(cookie2.session); + EXPECT_EQ(api::cookies::SAME_SITE_STATUS_STRICT, cookie2.same_site); + ASSERT_TRUE(cookie2.expiration_date.get()); + EXPECT_EQ(10000, *cookie2.expiration_date); TestingProfile profile; base::ListValue* tab_ids_list = new base::ListValue(); std::vector<int> tab_ids; - scoped_ptr<CookieStore> cookie_store( - cookies_helpers::CreateCookieStore(&profile, tab_ids_list)); - EXPECT_EQ("0", cookie_store->id); - EXPECT_EQ(tab_ids, cookie_store->tab_ids); + CookieStore cookie_store = + cookies_helpers::CreateCookieStore(&profile, tab_ids_list); + EXPECT_EQ("0", cookie_store.id); + EXPECT_EQ(tab_ids, cookie_store.tab_ids); } TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) { @@ -185,11 +183,12 @@ TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) { GURL(), std::string(), "011Q255bNX_1!yd\203e+", "test.com", "/path\203", base::Time(), base::Time(), base::Time(), false, false, net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT); - scoped_ptr<Cookie> cookie( - cookies_helpers::CreateCookie( - canonical_cookie, "some cookie store")); - EXPECT_EQ(std::string("011Q255bNX_1!yd\xEF\xBF\xBD" "e+"), cookie->value); - EXPECT_EQ(std::string(), cookie->path); + Cookie cookie = + cookies_helpers::CreateCookie(canonical_cookie, "some cookie store"); + EXPECT_EQ(std::string("011Q255bNX_1!yd\xEF\xBF\xBD" + "e+"), + cookie.value); + EXPECT_EQ(std::string(), cookie.path); } } // namespace extensions diff --git a/chrome/browser/extensions/api/copresence/copresence_api.cc b/chrome/browser/extensions/api/copresence/copresence_api.cc index e5e6e6d..44bfca7 100644 --- a/chrome/browser/extensions/api/copresence/copresence_api.cc +++ b/chrome/browser/extensions/api/copresence/copresence_api.cc @@ -7,7 +7,6 @@ #include <utility> #include "base/lazy_instance.h" -#include "base/memory/linked_ptr.h" #include "chrome/browser/copresence/chrome_whispernet_client.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" @@ -136,16 +135,16 @@ void CopresenceService::HandleMessages( } int message_count = messages.size(); - std::vector<linked_ptr<api::copresence::Message>> api_messages( - message_count); - - for (int m = 0; m < message_count; ++m) { - api_messages[m].reset(new api::copresence::Message); - api_messages[m]->type = messages[m].type().type(); - api_messages[m]->payload.assign(messages[m].payload().begin(), - messages[m].payload().end()); - DVLOG(2) << "Dispatching message of type " << api_messages[m]->type << ":\n" - << messages[m].payload(); + std::vector<api::copresence::Message> api_messages(message_count); + + for (const copresence::Message& message : messages) { + api::copresence::Message api_message; + api_message.type = message.type().type(); + api_message.payload.assign(message.payload().begin(), + message.payload().end()); + api_messages.push_back(std::move(api_message)); + DVLOG(2) << "Dispatching message of type " << api_message.type << ":\n" + << message.payload(); } // Send the messages to the client app. diff --git a/chrome/browser/extensions/api/copresence/copresence_translations.cc b/chrome/browser/extensions/api/copresence/copresence_translations.cc index 779040e..3537e2c 100644 --- a/chrome/browser/extensions/api/copresence/copresence_translations.cc +++ b/chrome/browser/extensions/api/copresence/copresence_translations.cc @@ -197,37 +197,33 @@ bool AddUnsubscribeToRequest(const std::string& app_id, return true; } -bool PrepareReportRequestProto( - const std::vector<linked_ptr<Operation>>& operations, - const std::string& app_id, - SubscriptionToAppMap* apps_by_subscription_id, - ReportRequest* request) { - for (const linked_ptr<Operation>& op : operations) { - DCHECK(op.get()); - +bool PrepareReportRequestProto(const std::vector<Operation>& operations, + const std::string& app_id, + SubscriptionToAppMap* apps_by_subscription_id, + ReportRequest* request) { + for (const Operation& op : operations) { // Verify our object has exactly one operation. - if (static_cast<int>(op->publish != nullptr) + - static_cast<int>(op->subscribe != nullptr) + - static_cast<int>(op->unpublish != nullptr) + - static_cast<int>(op->unsubscribe != nullptr) != 1) { + if (static_cast<int>(op.publish != nullptr) + + static_cast<int>(op.subscribe != nullptr) + + static_cast<int>(op.unpublish != nullptr) + + static_cast<int>(op.unsubscribe != nullptr) != + 1) { return false; } - if (op->publish) { - if (!AddPublishToRequest(app_id, *(op->publish), request)) + if (op.publish) { + if (!AddPublishToRequest(app_id, *(op.publish), request)) return false; - } else if (op->subscribe) { - if (!AddSubscribeToRequest( - app_id, *(op->subscribe), apps_by_subscription_id, request)) + } else if (op.subscribe) { + if (!AddSubscribeToRequest(app_id, *(op.subscribe), + apps_by_subscription_id, request)) return false; - } else if (op->unpublish) { - if (!AddUnpublishToRequest(op->unpublish->unpublish_id, request)) + } else if (op.unpublish) { + if (!AddUnpublishToRequest(op.unpublish->unpublish_id, request)) return false; - } else { // if (op->unsubscribe) - if (!AddUnsubscribeToRequest(app_id, - op->unsubscribe->unsubscribe_id, - apps_by_subscription_id, - request)) + } else { // if (op.unsubscribe) + if (!AddUnsubscribeToRequest(app_id, op.unsubscribe->unsubscribe_id, + apps_by_subscription_id, request)) return false; } } diff --git a/chrome/browser/extensions/api/copresence/copresence_translations.h b/chrome/browser/extensions/api/copresence/copresence_translations.h index a0f9fd9..4903c62 100644 --- a/chrome/browser/extensions/api/copresence/copresence_translations.h +++ b/chrome/browser/extensions/api/copresence/copresence_translations.h @@ -10,7 +10,6 @@ #include <vector> #include "base/macros.h" -#include "base/memory/linked_ptr.h" #include "components/copresence/proto/enums.pb.h" namespace copresence { @@ -34,7 +33,7 @@ typedef std::map<std::string, std::string> SubscriptionToAppMap; // Returns report request protocol buffer containing all the operations in the // given vector. If parsing any of the operations fails, we return false. bool PrepareReportRequestProto( - const std::vector<linked_ptr<api::copresence::Operation>>& operations, + const std::vector<api::copresence::Operation>& operations, const std::string& app_id, SubscriptionToAppMap* apps_by_subscription_id, copresence::ReportRequest* request); diff --git a/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc b/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc index 63df1d2..71d33ec 100644 --- a/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc +++ b/chrome/browser/extensions/api/copresence_private/copresence_private_api.cc @@ -103,8 +103,8 @@ ExtensionFunction::ResponseAction CopresencePrivateSendFoundFunction::Run() { std::vector<audio_modem::AudioToken> tokens; for (size_t i = 0; i < params->tokens.size(); ++i) { - tokens.push_back(audio_modem::AudioToken(params->tokens[i]->token, - params->tokens[i]->audible)); + tokens.push_back(audio_modem::AudioToken(params->tokens[i].token, + params->tokens[i].audible)); } whispernet_client->GetTokensCallback().Run(tokens); return RespondNow(NoArguments()); |