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

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

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1
Patch Set: Rebase. Created 4 years, 4 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"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/strings/pattern.h" 13 #include "base/strings/pattern.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/extensions/api/sessions/sessions_api.h" 16 #include "chrome/browser/extensions/api/sessions/sessions_api.h"
17 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 17 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
18 #include "chrome/browser/extensions/extension_apitest.h" 18 #include "chrome/browser/extensions/extension_apitest.h"
19 #include "chrome/browser/extensions/extension_function_test_utils.h" 19 #include "chrome/browser/extensions/extension_function_test_utils.h"
20 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
21 #include "chrome/browser/sync/chrome_sync_client.h" 21 #include "chrome/browser/sync/chrome_sync_client.h"
22 #include "chrome/browser/sync/profile_sync_service_factory.h" 22 #include "chrome/browser/sync/profile_sync_service_factory.h"
23 #include "chrome/browser/sync/profile_sync_test_util.h" 23 #include "chrome/browser/sync/profile_sync_test_util.h"
24 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/test/base/in_process_browser_test.h" 26 #include "chrome/test/base/in_process_browser_test.h"
27 #include "chrome/test/base/testing_browser_process.h" 27 #include "chrome/test/base/testing_browser_process.h"
28 #include "components/browser_sync/browser/profile_sync_service.h" 28 #include "components/browser_sync/browser/profile_sync_service.h"
29 #include "components/browser_sync/browser/profile_sync_service_mock.h" 29 #include "components/browser_sync/browser/profile_sync_service_mock.h"
30 #include "components/sync/api/attachments/attachment_id.h"
31 #include "components/sync/api/fake_sync_change_processor.h"
32 #include "components/sync/api/sync_error_factory_mock.h"
33 #include "components/sync/core/attachments/attachment_service_proxy_for_test.h"
30 #include "components/sync_driver/local_device_info_provider_mock.h" 34 #include "components/sync_driver/local_device_info_provider_mock.h"
31 #include "components/sync_driver/sync_api_component_factory_mock.h" 35 #include "components/sync_driver/sync_api_component_factory_mock.h"
32 #include "components/sync_sessions/sessions_sync_manager.h" 36 #include "components/sync_sessions/sessions_sync_manager.h"
33 #include "extensions/browser/api_test_utils.h" 37 #include "extensions/browser/api_test_utils.h"
34 #include "sync/api/attachments/attachment_id.h"
35 #include "sync/api/fake_sync_change_processor.h"
36 #include "sync/api/sync_error_factory_mock.h"
37 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "chromeos/chromeos_switches.h" 40 #include "chromeos/chromeos_switches.h"
41 #endif 41 #endif
42 42
43 namespace utils = extension_function_test_utils; 43 namespace utils = extension_function_test_utils;
44 44
45 namespace extensions { 45 namespace extensions {
46 46
47 namespace { 47 namespace {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 EXPECT_EQ(0u, sessions->GetSize()); 377 EXPECT_EQ(0u, sessions->GetSize());
378 } 378 }
379 379
380 // http://crbug.com/251199 380 // http://crbug.com/251199
381 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) { 381 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) {
382 ASSERT_TRUE(RunExtensionSubtest("sessions", 382 ASSERT_TRUE(RunExtensionSubtest("sessions",
383 "sessions.html")) << message_; 383 "sessions.html")) << message_;
384 } 384 }
385 385
386 } // namespace extensions 386 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698