Revert 270226 "Componentize GCM Part 1: create GCM component and..."

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/services/gcm/gcm_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #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"
 
 namespace gcm {
 
 namespace {
 
 const char kTestAccountID1[] = "user1@example.com";
 const char kTestAccountID2[] = "user2@example.com";
@@ skipping 1280 matching lines @@
   wrapper_->GetGCMClient()->ReceiveMessage(kTestAppID1, in_message5);
 
   wrapper_->gcm_app_handler()->WaitForNotification();
 
   EXPECT_EQ(FakeGCMAppHandler::MESSAGE_EVENT,
             wrapper_->gcm_app_handler()->received_event());
   EXPECT_EQ(in_message5.data, wrapper_->gcm_app_handler()->message().data);
 }
 
 }  // namespace gcm