Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

Issue 56113003: Implement new invalidations ack tracking system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modify drive TODO comment + rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/extensions/api/push_messaging/push_messaging_api.h" 5 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
6 6
7 #include "apps/launcher.h" 7 #include "apps/launcher.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h" 9 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_handler.h"
10 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_mapper.h" 10 #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidati on_mapper.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_test_message_listener.h" 12 #include "chrome/browser/extensions/extension_test_message_listener.h"
13 #include "chrome/browser/invalidation/fake_invalidation_service.h" 13 #include "chrome/browser/invalidation/fake_invalidation_service.h"
14 #include "chrome/browser/invalidation/invalidation_service.h" 14 #include "chrome/browser/invalidation/invalidation_service.h"
15 #include "chrome/browser/invalidation/invalidation_service_factory.h" 15 #include "chrome/browser/invalidation/invalidation_service_factory.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/common/chrome_switches.h" 18 #include "chrome/common/chrome_switches.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "google/cacheinvalidation/types.pb.h" 20 #include "google/cacheinvalidation/types.pb.h"
21 #include "sync/internal_api/public/base/invalidation.h"
21 #include "sync/notifier/fake_invalidator.h" 22 #include "sync/notifier/fake_invalidator.h"
22 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
23 24
24 using ::testing::_; 25 using ::testing::_;
25 using ::testing::SaveArg; 26 using ::testing::SaveArg;
26 using ::testing::StrictMock; 27 using ::testing::StrictMock;
27 28
28 using invalidation::InvalidationServiceFactory; 29 using invalidation::InvalidationServiceFactory;
29 30
30 namespace extensions { 31 namespace extensions {
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 const extensions::Extension* extension = 188 const extensions::Extension* extension =
188 LoadExtension(test_data_dir_.AppendASCII("push_messaging")); 189 LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
189 ASSERT_TRUE(extension); 190 ASSERT_TRUE(extension);
190 ui_test_utils::NavigateToURL( 191 ui_test_utils::NavigateToURL(
191 browser(), extension->GetResourceURL("get_channel_id.html")); 192 browser(), extension->GetResourceURL("get_channel_id.html"));
192 193
193 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 194 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
194 } 195 }
195 196
196 } // namespace extensions 197 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698