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

trunk/src/chrome/browser/extensions/api/gcm/gcm_apitest.cc

 // Copyright 2013 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 "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/gcm/gcm_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/services/gcm/gcm_client_factory.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/gcm_driver/gcm_client_factory.h"
 
 namespace {
 
 const char kEventsExtension[] = "gcm/events";
 
 gcm::GCMClient::SendErrorDetails CreateErrorDetails(
     const std::string& message_id,
     const gcm::GCMClient::Result result,
     const std::string& total_messages) {
   gcm::GCMClient::SendErrorDetails error;
@@ skipping 226 matching lines @@
   ResultCatcher incognito_catcher;
   incognito_catcher.RestrictToProfile(profile()->GetOffTheRecordProfile());
 
   ASSERT_TRUE(RunExtensionTestIncognito("gcm/functions/incognito"));
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(incognito_catcher.GetNextResult()) << incognito_catcher.message();
 }
 
 }  // namespace extensions