diff options
Diffstat (limited to 'chrome/test/live_sync')
-rw-r--r-- | chrome/test/live_sync/live_bookmarks_sync_test.cc | 9 | ||||
-rw-r--r-- | chrome/test/live_sync/live_bookmarks_sync_test.h | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.cc b/chrome/test/live_sync/live_bookmarks_sync_test.cc index 8d16edc..b8836c7 100644 --- a/chrome/test/live_sync/live_bookmarks_sync_test.cc +++ b/chrome/test/live_sync/live_bookmarks_sync_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,6 +13,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" #include "chrome/test/ui_test_utils.h" +#include "net/base/mock_host_resolver.h" namespace switches { const wchar_t kSyncUserForTest[] = L"sync-user-for-test"; @@ -52,6 +53,12 @@ class BookmarkLoadObserver : public BookmarkModelObserver { DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver); }; +LiveBookmarksSyncTest::LiveBookmarksSyncTest() { +} + +LiveBookmarksSyncTest::~LiveBookmarksSyncTest() { +} + // static void LiveBookmarksSyncTest::BlockUntilLoaded(BookmarkModel* m) { if (m->IsLoaded()) diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h index 1ff0251..134e82f 100644 --- a/chrome/test/live_sync/live_bookmarks_sync_test.h +++ b/chrome/test/live_sync/live_bookmarks_sync_test.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -16,6 +16,9 @@ class BookmarkModel; class BookmarkNode; class Profile; +namespace net { +class ScopedDefaultHostResolverProc; +} namespace switches { extern const wchar_t kSyncUserForTest[]; @@ -27,8 +30,8 @@ extern const wchar_t kSyncPasswordForTest[]; // without a valid sync server set up. class LiveBookmarksSyncTest : public InProcessBrowserTest { public: - LiveBookmarksSyncTest() { } - ~LiveBookmarksSyncTest() { } + LiveBookmarksSyncTest(); + ~LiveBookmarksSyncTest(); virtual void SetUp() { // At this point, the browser hasn't been launched, and no services are |