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

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

Issue 1230313005: split port_util.h off of net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove garbage that got added Created 5 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "components/search_engines/template_url_service.h" 64 #include "components/search_engines/template_url_service.h"
65 #include "components/signin/core/browser/profile_identity_provider.h" 65 #include "components/signin/core/browser/profile_identity_provider.h"
66 #include "components/signin/core/browser/signin_manager.h" 66 #include "components/signin/core/browser/signin_manager.h"
67 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
68 #include "content/public/browser/web_contents.h" 68 #include "content/public/browser/web_contents.h"
69 #include "content/public/test/test_browser_thread.h" 69 #include "content/public/test/test_browser_thread.h"
70 #include "google_apis/gaia/gaia_urls.h" 70 #include "google_apis/gaia/gaia_urls.h"
71 #include "net/base/escape.h" 71 #include "net/base/escape.h"
72 #include "net/base/load_flags.h" 72 #include "net/base/load_flags.h"
73 #include "net/base/network_change_notifier.h" 73 #include "net/base/network_change_notifier.h"
74 #include "net/base/port_util.h"
74 #include "net/cookies/cookie_monster.h" 75 #include "net/cookies/cookie_monster.h"
75 #include "net/test/spawned_test_server/spawned_test_server.h" 76 #include "net/test/spawned_test_server/spawned_test_server.h"
76 #include "net/url_request/test_url_fetcher_factory.h" 77 #include "net/url_request/test_url_fetcher_factory.h"
77 #include "net/url_request/url_fetcher.h" 78 #include "net/url_request/url_fetcher.h"
78 #include "net/url_request/url_fetcher_delegate.h" 79 #include "net/url_request/url_fetcher_delegate.h"
79 #include "net/url_request/url_request_context.h" 80 #include "net/url_request/url_request_context.h"
80 #include "net/url_request/url_request_context_getter.h" 81 #include "net/url_request/url_request_context_getter.h"
81 #include "sync/engine/sync_scheduler_impl.h" 82 #include "sync/engine/sync_scheduler_impl.h"
82 #include "sync/protocol/sync.pb.h" 83 #include "sync/protocol/sync.pb.h"
83 #include "sync/test/fake_server/fake_server.h" 84 #include "sync/test/fake_server/fake_server.h"
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 content::NotificationService::current()->Notify( 1061 content::NotificationService::current()->Notify(
1061 chrome::NOTIFICATION_SYNC_REFRESH_LOCAL, 1062 chrome::NOTIFICATION_SYNC_REFRESH_LOCAL,
1062 content::Source<Profile>(GetProfile(index)), 1063 content::Source<Profile>(GetProfile(index)),
1063 content::Details<const syncer::ModelTypeSet>(&model_types)); 1064 content::Details<const syncer::ModelTypeSet>(&model_types));
1064 } 1065 }
1065 1066
1066 void SyncTest::SetPreexistingPreferencesFileContents( 1067 void SyncTest::SetPreexistingPreferencesFileContents(
1067 const std::string& contents) { 1068 const std::string& contents) {
1068 preexisting_preferences_file_contents_ = contents; 1069 preexisting_preferences_file_contents_ = contents;
1069 } 1070 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/startup_browser_creator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698