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

Unified Diff: components/gcm_driver/gcm_driver.cc

Issue 1259613002: Revert of Hook up the Push API with GCM's new ability to own encryption keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gcm-encryption
Patch Set: Created 5 years, 5 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
« no previous file with comments | « components/gcm_driver/gcm_driver.h ('k') | components/gcm_driver/gcm_driver_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/gcm_driver/gcm_driver.cc
diff --git a/components/gcm_driver/gcm_driver.cc b/components/gcm_driver/gcm_driver.cc
index 4e17801f33539a8a781a0a444656b10e2f3dd7f6..cebec36b0dab0f0e3cd56b5eb79faf5293980a46 100644
--- a/components/gcm_driver/gcm_driver.cc
+++ b/components/gcm_driver/gcm_driver.cc
@@ -7,13 +7,14 @@
#include <algorithm>
#include "base/bind.h"
-#include "base/files/file_path.h"
#include "base/logging.h"
#include "components/gcm_driver/gcm_app_handler.h"
namespace gcm {
+namespace {
const size_t kMaxSenders = 100;
+} // namespace
InstanceIDHandler::InstanceIDHandler() {
}
@@ -26,14 +27,7 @@
DeleteToken(app_id, "*", "*", callback);
}
-GCMDriver::GCMDriver(
- const base::FilePath& store_path,
- const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner)
- : weak_ptr_factory_(this) {
- // The |blocking_task_runner| can be NULL for tests that do not need the
- // encryption capabilities of the GCMDriver class.
- if (blocking_task_runner)
- encryption_provider_.Init(store_path, blocking_task_runner);
+GCMDriver::GCMDriver() : weak_ptr_factory_(this) {
}
GCMDriver::~GCMDriver() {
@@ -155,12 +149,6 @@
SendImpl(app_id, receiver_id, message);
}
-void GCMDriver::GetPublicKey(
- const std::string& app_id,
- const GetPublicKeyCallback& callback) {
- encryption_provider_.GetPublicKey(app_id, callback);
-}
-
void GCMDriver::UnregisterWithSenderIdImpl(const std::string& app_id,
const std::string& sender_id) {
NOTREACHED();
« no previous file with comments | « components/gcm_driver/gcm_driver.h ('k') | components/gcm_driver/gcm_driver_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698