trunk/src/chrome/browser/services/gcm/gcm_service_unittest.cc - Issue 281783004: Revert 270226 "Componentize GCM Part 1: create GCM component and..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/services/gcm/gcm_service_unittest.cc

Issue 281783004: Revert 270226 "Componentize GCM Part 1: create GCM component and..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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:

Index: trunk/src/chrome/browser/services/gcm/gcm_service_unittest.cc

===================================================================

--- trunk/src/chrome/browser/services/gcm/gcm_service_unittest.cc (revision 270233)

+++ trunk/src/chrome/browser/services/gcm/gcm_service_unittest.cc (working copy)

@@ -12,14 +12,13 @@

#include "base/run_loop.h"

#include "base/strings/string_util.h"

#include "chrome/browser/services/gcm/fake_gcm_client_factory.h"

+#include "chrome/browser/services/gcm/gcm_app_handler.h"

+#include "chrome/browser/services/gcm/gcm_client_factory.h"

#include "chrome/browser/services/gcm/gcm_client_mock.h"

-#include "components/gcm_driver/gcm_app_handler.h"

-#include "components/gcm_driver/gcm_client_factory.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "google_apis/gaia/fake_identity_provider.h"

#include "google_apis/gaia/fake_oauth2_token_service.h"

-#include "google_apis/gcm/base/fake_encryptor.h"

#include "net/url_request/url_request_context_getter.h"

#include "net/url_request/url_request_test_util.h"

#include "testing/gtest/include/gtest/gtest.h"