Move gcm-independent parts of push messaging out of gcm namespace and directory

chrome/browser/push_messaging/push_messaging_application_id_unittest.cc

Index: chrome/browser/push_messaging/push_messaging_application_id_unittest.cc
diff --git a/chrome/browser/services/gcm/push_messaging_application_id_unittest.cc b/chrome/browser/push_messaging/push_messaging_application_id_unittest.cc
similarity index 83%
rename from chrome/browser/services/gcm/push_messaging_application_id_unittest.cc
rename to chrome/browser/push_messaging/push_messaging_application_id_unittest.cc
index 34944db55cf3fbad17d79179f625ea552df98130..54f1ab76ae7a68466a7eb5ecf273f4f4aff935b1 100644
--- a/chrome/browser/services/gcm/push_messaging_application_id_unittest.cc
+++ b/chrome/browser/push_messaging/push_messaging_application_id_unittest.cc
@@ -2,11 +2,9 @@
 // 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/push_messaging_application_id.h"
+#include "chrome/browser/push_messaging/push_messaging_application_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace gcm {
-
 class PushMessagingApplicationIdTest : public testing::Test {
  protected:
   PushMessagingApplicationId GenerateId(
@@ -14,7 +12,7 @@ class PushMessagingApplicationIdTest : public testing::Test {
       int64 service_worker_registration_id) {
     // To bypass DCHECK in PushMessagingApplicationId::Generate, we just use it
     // to generate app_id_guid, and then use private constructor.
-    std::string app_id_guid = gcm::PushMessagingApplicationId::Generate(
+    std::string app_id_guid = PushMessagingApplicationId::Generate(
         GURL("https://www.example.com/"), 1).app_id_guid();
     return PushMessagingApplicationId(app_id_guid, origin,
                                       service_worker_registration_id);
@@ -32,10 +30,8 @@ TEST_F(PushMessagingApplicationIdTest, ConstructorValidity) {
 }
 
 TEST_F(PushMessagingApplicationIdTest, UniqueGuids) {
-  EXPECT_NE(gcm::PushMessagingApplicationId::Generate(
+  EXPECT_NE(PushMessagingApplicationId::Generate(
                 GURL("https://www.example.com/"), 1).app_id_guid(),
-            gcm::PushMessagingApplicationId::Generate(
+            PushMessagingApplicationId::Generate(
                 GURL("https://www.example.com/"), 1).app_id_guid());
 }
-
-}  // namespace gcm