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

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 (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/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "net/test/spawned_test_server/spawned_test_server.h" 79 #include "net/test/spawned_test_server/spawned_test_server.h"
80 #include "net/url_request/test_url_fetcher_factory.h" 80 #include "net/url_request/test_url_fetcher_factory.h"
81 #include "net/url_request/url_fetcher.h" 81 #include "net/url_request/url_fetcher.h"
82 #include "net/url_request/url_fetcher_delegate.h" 82 #include "net/url_request/url_fetcher_delegate.h"
83 #include "net/url_request/url_request_context.h" 83 #include "net/url_request/url_request_context.h"
84 #include "net/url_request/url_request_context_getter.h" 84 #include "net/url_request/url_request_context_getter.h"
85 #include "sync/engine/sync_scheduler_impl.h" 85 #include "sync/engine/sync_scheduler_impl.h"
86 #include "sync/protocol/sync.pb.h" 86 #include "sync/protocol/sync.pb.h"
87 #include "sync/test/fake_server/fake_server.h" 87 #include "sync/test/fake_server/fake_server.h"
88 #include "sync/test/fake_server/fake_server_network_resources.h" 88 #include "sync/test/fake_server/fake_server_network_resources.h"
89 #include "ui/gfx/host_desktop_type.h"
89 #include "url/gurl.h" 90 #include "url/gurl.h"
90 91
91 #if defined(OS_CHROMEOS) 92 #if defined(OS_CHROMEOS)
92 #include "chromeos/chromeos_switches.h" 93 #include "chromeos/chromeos_switches.h"
93 #endif 94 #endif
94 95
95 using content::BrowserThread; 96 using content::BrowserThread;
96 97
97 namespace switches { 98 namespace switches {
98 const char kPasswordFileForTest[] = "password-file-for-test"; 99 const char kPasswordFileForTest[] = "password-file-for-test";
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 content::NotificationService::current()->Notify( 1100 content::NotificationService::current()->Notify(
1100 chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, 1101 chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
1101 content::Source<Profile>(GetProfile(index)), 1102 content::Source<Profile>(GetProfile(index)),
1102 content::Details<const syncer::ModelTypeSet>(&model_types)); 1103 content::Details<const syncer::ModelTypeSet>(&model_types));
1103 } 1104 }
1104 1105
1105 void SyncTest::SetPreexistingPreferencesFileContents( 1106 void SyncTest::SetPreexistingPreferencesFileContents(
1106 const std::string& contents) { 1107 const std::string& contents) {
1107 preexisting_preferences_file_contents_ = contents; 1108 preexisting_preferences_file_contents_ = contents;
1108 } 1109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698