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

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

Issue 436373002: Move non-API code out of sync/api/attachments/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Apply CR feedback. Created 6 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 | Annotate | Revision Log
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 "chrome/browser/extensions/api/sessions/sessions_api.h" 5 #include "chrome/browser/extensions/api/sessions/sessions_api.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 10 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
11 #include "chrome/browser/extensions/extension_apitest.h" 11 #include "chrome/browser/extensions/extension_apitest.h"
12 #include "chrome/browser/extensions/extension_function_test_utils.h" 12 #include "chrome/browser/extensions/extension_function_test_utils.h"
13 #include "chrome/browser/profiles/profile_manager.h" 13 #include "chrome/browser/profiles/profile_manager.h"
14 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" 14 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
15 #include "chrome/browser/sync/open_tabs_ui_delegate.h" 15 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
16 #include "chrome/browser/sync/profile_sync_components_factory_mock.h" 16 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
17 #include "chrome/browser/sync/profile_sync_service.h" 17 #include "chrome/browser/sync/profile_sync_service.h"
18 #include "chrome/browser/sync/profile_sync_service_factory.h" 18 #include "chrome/browser/sync/profile_sync_service_factory.h"
19 #include "chrome/browser/sync/profile_sync_service_mock.h" 19 #include "chrome/browser/sync/profile_sync_service_mock.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/test_switches.h" 23 #include "chrome/test/base/test_switches.h"
24 #include "chrome/test/base/testing_browser_process.h" 24 #include "chrome/test/base/testing_browser_process.h"
25 #include "sync/api/attachments/attachment_id.h" 25 #include "sync/api/attachments/attachment_id.h"
26 #include "sync/api/attachments/attachment_service_proxy_for_test.h"
27 #include "sync/api/fake_sync_change_processor.h" 26 #include "sync/api/fake_sync_change_processor.h"
28 #include "sync/api/sync_error_factory_mock.h" 27 #include "sync/api/sync_error_factory_mock.h"
28 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
29 29
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 #include "chromeos/chromeos_switches.h" 31 #include "chromeos/chromeos_switches.h"
32 #endif 32 #endif
33 33
34 namespace utils = extension_function_test_utils; 34 namespace utils = extension_function_test_utils;
35 35
36 namespace extensions { 36 namespace extensions {
37 37
38 namespace { 38 namespace {
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 360 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
361 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 361 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
362 return; 362 return;
363 #endif 363 #endif
364 364
365 ASSERT_TRUE(RunExtensionSubtest("sessions", 365 ASSERT_TRUE(RunExtensionSubtest("sessions",
366 "sessions.html")) << message_; 366 "sessions.html")) << message_;
367 } 367 }
368 368
369 } // namespace extensions 369 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698