[PUSH] Merge notifications and push messaging prompts

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       '../apps/saved_files_service_unittest.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.cc',
       '../components/autofill/content/renderer/test_password_autofill_agent.h',
       '../components/autofill/content/renderer/test_password_generation_agent.cc',
@@ skipping 697 matching lines @@
       'browser/search_engines/search_provider_install_data_unittest.cc',
       'browser/search_engines/template_url_scraper_unittest.cc',
       'browser/service_process/service_process_control_mac_unittest.mm',
       'browser/services/gcm/fake_gcm_profile_service.cc',
       'browser/services/gcm/fake_gcm_profile_service.h',
       'browser/services/gcm/fake_signin_manager.cc',
       'browser/services/gcm/fake_signin_manager.h',
       'browser/services/gcm/gcm_account_tracker_unittest.cc',
       'browser/services/gcm/gcm_profile_service_unittest.cc',
       'browser/services/gcm/push_messaging_application_id_unittest.cc',
+      'browser/services/gcm/push_messaging_permission_context_unittest.cc',
       'browser/sessions/persistent_tab_restore_service_unittest.cc',
       'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
       'browser/sessions/session_backend_unittest.cc',
       'browser/sessions/session_service_unittest.cc',
       'browser/sessions/session_types_unittest.cc',
       'browser/shell_integration_linux_unittest.cc',
       'browser/shell_integration_win_unittest.cc',
       'browser/signin/account_reconcilor_unittest.cc',
       'browser/signin/account_service_flag_fetcher_unittest.cc',
       'browser/signin/easy_unlock_screenlock_state_handler_unittest.cc',
@@ skipping 2193 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }