diff options
Diffstat (limited to 'chrome/browser/push_messaging')
10 files changed, 25 insertions, 8 deletions
diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.h b/chrome/browser/push_messaging/push_messaging_app_identifier.h index 542350d..5e8e1a7 100644 --- a/chrome/browser/push_messaging/push_messaging_app_identifier.h +++ b/chrome/browser/push_messaging/push_messaging_app_identifier.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APP_IDENTIFIER_H_ +#include <stddef.h> #include <stdint.h> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/logging.h" #include "url/gurl.h" diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc b/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc index 4face03..6ca0cea 100644 --- a/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_app_identifier_unittest.cc @@ -4,6 +4,8 @@ #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" +#include <stdint.h> + #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index e7a3708..caa8a8d 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc @@ -2,15 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include "base/barrier_closure.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browsing_data/browsing_data_helper.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" @@ -173,7 +178,7 @@ class PushMessagingBrowserTest : public InProcessBrowserTest { } PushMessagingAppIdentifier GetAppIdentifierForServiceWorkerRegistration( - int64 service_worker_registration_id); + int64_t service_worker_registration_id); void SendMessageAndWaitUntilHandled( const PushMessagingAppIdentifier& app_identifier, @@ -263,7 +268,7 @@ void PushMessagingBrowserTest::TryToSubscribeSuccessfully( PushMessagingAppIdentifier PushMessagingBrowserTest::GetAppIdentifierForServiceWorkerRegistration( - int64 service_worker_registration_id) { + int64_t service_worker_registration_id) { GURL origin = https_server()->GetURL("/").GetOrigin(); PushMessagingAppIdentifier app_identifier = PushMessagingAppIdentifier::FindByServiceWorker( diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc index e5ec50a..bf7390a 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc @@ -4,6 +4,8 @@ #include "chrome/browser/push_messaging/push_messaging_notification_manager.h" +#include <stddef.h> + #include <bitset> #include "base/metrics/histogram_macros.h" diff --git a/chrome/browser/push_messaging/push_messaging_permission_context.h b/chrome/browser/push_messaging/push_messaging_permission_context.h index 5ff4533..a23e259 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context.h +++ b/chrome/browser/push_messaging/push_messaging_permission_context.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_H_ #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "chrome/browser/permissions/permission_context_base.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h index baa261f..f5b6e93 100644 --- a/chrome/browser/push_messaging/push_messaging_permission_context_factory.h +++ b/chrome/browser/push_messaging/push_messaging_permission_context_factory.h @@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_FACTORY_H_ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_PERMISSION_CONTEXT_FACTORY_H_ +#include "base/macros.h" #include "base/memory/singleton.h" #include "chrome/browser/permissions/permission_context_factory_base.h" diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.h b/chrome/browser/push_messaging/push_messaging_service_factory.h index ded124e..27591f0 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.h +++ b/chrome/browser/push_messaging/push_messaging_service_factory.h @@ -6,6 +6,7 @@ #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_FACTORY_H_ #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc index 1436a08..4819ec7 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc @@ -14,6 +14,7 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" +#include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/permissions/permission_manager.h" @@ -240,7 +241,7 @@ void PushMessagingServiceImpl::OnMessage(const std::string& app_id, void PushMessagingServiceImpl::DeliverMessageCallback( const std::string& app_id, const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const gcm::IncomingMessage& message, const base::Closure& message_handled_closure, content::PushDeliveryStatus status) { @@ -340,7 +341,7 @@ GURL PushMessagingServiceImpl::GetPushEndpoint() { void PushMessagingServiceImpl::SubscribeFromDocument( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, int renderer_id, int render_frame_id, @@ -384,7 +385,7 @@ void PushMessagingServiceImpl::SubscribeFromDocument( void PushMessagingServiceImpl::SubscribeFromWorker( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, bool user_visible, const content::PushMessagingService::RegisterCallback& register_callback) { @@ -577,7 +578,7 @@ void PushMessagingServiceImpl::DidGetEncryptionInfo( void PushMessagingServiceImpl::Unsubscribe( const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const std::string& sender_id, const content::PushMessagingService::UnregisterCallback& callback) { PushMessagingAppIdentifier app_identifier = diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h index 6114583..e215ea4 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.h +++ b/chrome/browser/push_messaging/push_messaging_service_impl.h @@ -12,6 +12,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/background/background_trigger.h" @@ -128,7 +129,7 @@ class PushMessagingServiceImpl : public content::PushMessagingService, void DeliverMessageCallback(const std::string& app_id, const GURL& requesting_origin, - int64 service_worker_registration_id, + int64_t service_worker_registration_id, const gcm::IncomingMessage& message, const base::Closure& message_handled_closure, content::PushDeliveryStatus status); diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc index 52a7069..31446b9 100644 --- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc @@ -4,10 +4,13 @@ #include "content/public/browser/push_messaging_service.h" +#include <stdint.h> + #include <string> #include <vector> #include "base/command_line.h" +#include "base/macros.h" #include "base/run_loop.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/permissions/permission_manager.h" |