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

Unified Diff: chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

Issue 897793002: Remove gcm channel state supported by sync service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android builds Created 5 years, 10 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 | « chrome/browser/extensions/api/gcm/gcm_apitest.cc ('k') | chrome/browser/invalidation/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index ecf8310f6f4eec7527545bc7eb05e51ddf313fc4..e9dc54360f1550b58c8830f1e5fedc8c8a235b0e 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -17,7 +17,6 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -29,7 +28,6 @@
#include "chrome/browser/services/gcm/gcm_profile_service.h"
#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
#include "chrome/common/chrome_paths.h"
-#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "components/gcm_driver/fake_gcm_app_handler.h"
#include "components/gcm_driver/fake_gcm_client.h"
@@ -233,9 +231,6 @@ class ExtensionGCMAppHandlerTest : public testing::Test {
extension_service_->set_show_extensions_prompts(false);
extension_service_->set_install_updates_when_idle_for_test(false);
- // Enable GCM such that tests could be run on all channels.
- profile()->GetPrefs()->SetBoolean(prefs::kGCMChannelEnabled, true);
-
// Create GCMProfileService that talks with fake GCMClient.
gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactoryAndUse(
profile(), &ExtensionGCMAppHandlerTest::BuildGCMProfileService);
« no previous file with comments | « chrome/browser/extensions/api/gcm/gcm_apitest.cc ('k') | chrome/browser/invalidation/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698