summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-15 00:36:16 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-15 00:36:16 +0000
commit82d9d295c3201f484710e9f519f98b02ebfe7b61 (patch)
treeaffec3d1e5ad4702fda0c5ca4b06cb569359e9ea /chrome/browser/profile.cc
parentbd33ed7ac21b7c7fbee5b716092092434f62a469 (diff)
downloadchromium_src-82d9d295c3201f484710e9f519f98b02ebfe7b61.zip
chromium_src-82d9d295c3201f484710e9f519f98b02ebfe7b61.tar.gz
chromium_src-82d9d295c3201f484710e9f519f98b02ebfe7b61.tar.bz2
Replaced NetworkStatusDetector with use of NetworkChangeNotifier
from net/. Removed NetworkStatusDetector files and related. Cleaned up some test-related code. BUG=19784 TEST=manually Review URL: http://codereview.chromium.org/1451001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 84f6b44..83c8ba7 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -54,6 +54,7 @@
#include "chrome/browser/sessions/session_service.h"
#include "chrome/browser/sessions/tab_restore_service.h"
#include "chrome/browser/ssl/ssl_host_state.h"
+#include "chrome/browser/sync/net/network_change_notifier_io_thread.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_factory_impl.h"
#include "chrome/browser/tabs/pinned_tab_service.h"
@@ -1495,8 +1496,11 @@ CloudPrintProxyService* ProfileImpl::GetCloudPrintProxyService() {
}
void ProfileImpl::InitSyncService() {
+ network_change_notifier_thread_.reset(
+ new NetworkChangeNotifierIOThread(g_browser_process->io_thread()));
profile_sync_factory_.reset(
new ProfileSyncFactoryImpl(this,
+ network_change_notifier_thread_.get(),
CommandLine::ForCurrentProcess()));
sync_service_.reset(
profile_sync_factory_->CreateProfileSyncService());