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

chrome/browser/push_messaging/push_messaging_application_id.h

 // 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.
 
-#ifndef CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_APPLICATION_ID_H_
-#define CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_APPLICATION_ID_H_
+#ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APPLICATION_ID_H_
+#define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APPLICATION_ID_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
-namespace gcm {
-
 // The prefix used for all push messaging application ids.
 extern const char kPushMessagingApplicationIdPrefix[];
 
 // Type used to identify a web app from a Push API perspective.
 // These can be persisted to disk, in a 1:1 mapping between app_id_guid and
 // pair<origin, service_worker_registration_id>.
 class PushMessagingApplicationId {
  public:
   // Register profile-specific prefs.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
@@ skipping 41 matching lines @@
   // Constructs a valid app id.
   PushMessagingApplicationId(const std::string& app_id_guid,
                              const GURL& origin,
                              int64 service_worker_registration_id);
 
   std::string app_id_guid_;
   GURL origin_;
   int64 service_worker_registration_id_;
 };
 
-}  // namespace gcm
-
-#endif  // CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_APPLICATION_ID_H_
+#endif  // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_APPLICATION_ID_H_