OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "chrome/browser/extensions/app_notify_channel_setup.h" | 6 #include "chrome/browser/extensions/app_notify_channel_setup.h" |
7 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 AppNotifyChannelSetup::SetInterceptorForTests(&interceptor); | 56 AppNotifyChannelSetup::SetInterceptorForTests(&interceptor); |
57 | 57 |
58 const extensions::Extension* app = | 58 const extensions::Extension* app = |
59 LoadExtension(test_data_dir_.AppendASCII("app_notifications")); | 59 LoadExtension(test_data_dir_.AppendASCII("app_notifications")); |
60 ASSERT_TRUE(app != NULL); | 60 ASSERT_TRUE(app != NULL); |
61 | 61 |
62 application_launch::OpenApplication(application_launch::LaunchParams( | 62 application_launch::OpenApplication(application_launch::LaunchParams( |
63 browser()->profile(), app, extension_misc::LAUNCH_TAB, | 63 browser()->profile(), app, extension_misc::LAUNCH_TAB, |
64 NEW_FOREGROUND_TAB)); | 64 NEW_FOREGROUND_TAB)); |
65 if (!interceptor.was_called()) | 65 if (!interceptor.was_called()) |
66 ui_test_utils::RunMessageLoop(); | 66 content::RunMessageLoop(); |
67 EXPECT_TRUE(interceptor.was_called()); | 67 EXPECT_TRUE(interceptor.was_called()); |
68 | 68 |
69 ExtensionService* service = browser()->profile()->GetExtensionService(); | 69 ExtensionService* service = browser()->profile()->GetExtensionService(); |
70 extensions::ExtensionPrefs* prefs = service->extension_prefs(); | 70 extensions::ExtensionPrefs* prefs = service->extension_prefs(); |
71 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); | 71 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); |
72 EXPECT_EQ(kExpectedClientId, saved_id); | 72 EXPECT_EQ(kExpectedClientId, saved_id); |
73 } | 73 } |
OLD | NEW |