| 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(browser()->profile(), | 62 application_launch::OpenApplication(browser()->profile(), |
| 63 app, | 63 app, |
| 64 extension_misc::LAUNCH_TAB, | 64 extension_misc::LAUNCH_TAB, |
| 65 GURL(), | 65 GURL(), |
| 66 NEW_FOREGROUND_TAB); | 66 NEW_FOREGROUND_TAB, |
| 67 NULL); |
| 67 if (!interceptor.was_called()) | 68 if (!interceptor.was_called()) |
| 68 ui_test_utils::RunMessageLoop(); | 69 ui_test_utils::RunMessageLoop(); |
| 69 EXPECT_TRUE(interceptor.was_called()); | 70 EXPECT_TRUE(interceptor.was_called()); |
| 70 | 71 |
| 71 ExtensionService* service = browser()->profile()->GetExtensionService(); | 72 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 72 ExtensionPrefs* prefs = service->extension_prefs(); | 73 ExtensionPrefs* prefs = service->extension_prefs(); |
| 73 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); | 74 std::string saved_id = prefs->GetAppNotificationClientId(app->id()); |
| 74 EXPECT_EQ(kExpectedClientId, saved_id); | 75 EXPECT_EQ(kExpectedClientId, saved_id); |
| 75 } | 76 } |
| OLD | NEW |