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

Side by Side Diff: chrome/browser/extensions/api/sessions/sessions_apitest.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: Created 4 years, 2 months 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 #endif 175 #endif
176 } 176 }
177 177
178 void ExtensionSessionsTest::SetUpOnMainThread() { 178 void ExtensionSessionsTest::SetUpOnMainThread() {
179 CreateTestProfileSyncService(); 179 CreateTestProfileSyncService();
180 CreateTestExtension(); 180 CreateTestExtension();
181 } 181 }
182 182
183 std::unique_ptr<KeyedService> ExtensionSessionsTest::BuildProfileSyncService( 183 std::unique_ptr<KeyedService> ExtensionSessionsTest::BuildProfileSyncService(
184 content::BrowserContext* context) { 184 content::BrowserContext* context) {
185 std::unique_ptr<syncer::SyncApiComponentFactoryMock> factory( 185 std::unique_ptr<SyncApiComponentFactoryMock> factory(
186 new syncer::SyncApiComponentFactoryMock()); 186 new SyncApiComponentFactoryMock());
187 187
188 factory->SetLocalDeviceInfoProvider( 188 factory->SetLocalDeviceInfoProvider(
189 std::unique_ptr<syncer::LocalDeviceInfoProvider>( 189 std::unique_ptr<sync_driver::LocalDeviceInfoProvider>(
190 new syncer::LocalDeviceInfoProviderMock( 190 new sync_driver::LocalDeviceInfoProviderMock(
191 kSessionTags[0], "machine name", "Chromium 10k", "Chrome 10k", 191 kSessionTags[0], "machine name", "Chromium 10k", "Chrome 10k",
192 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id"))); 192 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id")));
193 193
194 Profile* profile = static_cast<Profile*>(context); 194 Profile* profile = static_cast<Profile*>(context);
195 browser_sync::ProfileSyncServiceMock* sync_service = 195 browser_sync::ProfileSyncServiceMock* sync_service =
196 new browser_sync::ProfileSyncServiceMock( 196 new browser_sync::ProfileSyncServiceMock(
197 CreateProfileSyncServiceParamsForTest( 197 CreateProfileSyncServiceParamsForTest(
198 base::MakeUnique<browser_sync::ChromeSyncClient>(profile), 198 base::MakeUnique<browser_sync::ChromeSyncClient>(profile),
199 profile)); 199 profile));
200 static_cast<browser_sync::ChromeSyncClient*>(sync_service->GetSyncClient()) 200 static_cast<browser_sync::ChromeSyncClient*>(sync_service->GetSyncClient())
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 EXPECT_EQ(0u, sessions->GetSize()); 379 EXPECT_EQ(0u, sessions->GetSize());
380 } 380 }
381 381
382 // http://crbug.com/251199 382 // http://crbug.com/251199
383 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) { 383 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) {
384 ASSERT_TRUE(RunExtensionSubtest("sessions", 384 ASSERT_TRUE(RunExtensionSubtest("sessions",
385 "sessions.html")) << message_; 385 "sessions.html")) << message_;
386 } 386 }
387 387
388 } // namespace extensions 388 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698