| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 #ifdef CHROME_PERSONALIZATION | 5 #ifdef CHROME_PERSONALIZATION |
| 6 | 6 |
| 7 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ | 7 #ifndef CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ |
| 8 #define CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ | 8 #define CHROME_TEST_LIVE_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 // Utility to block (by running the current MessageLoop) until the model has | 63 // Utility to block (by running the current MessageLoop) until the model has |
| 64 // loaded. Note this is required instead of using m->BlockTillLoaded, as that | 64 // loaded. Note this is required instead of using m->BlockTillLoaded, as that |
| 65 // cannot be called from the main thread (deadlock will occur). | 65 // cannot be called from the main thread (deadlock will occur). |
| 66 static void BlockUntilLoaded(BookmarkModel* m); | 66 static void BlockUntilLoaded(BookmarkModel* m); |
| 67 | 67 |
| 68 protected: | 68 protected: |
| 69 std::string username_; | 69 std::string username_; |
| 70 std::string password_; | 70 std::string password_; |
| 71 | 71 |
| 72 virtual void SetUpInProcessBrowserTestFixture(); |
| 73 virtual void TearDownInProcessBrowserTestFixture(); |
| 74 |
| 72 private: | 75 private: |
| 76 // LiveBookmarksSyncTests need to make live DNS requests for access to |
| 77 // GAIA and sync server URLs under google.com. We use a scoped version |
| 78 // to override the default resolver while the test is active. |
| 79 scoped_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_override_; |
| 80 |
| 73 DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest); | 81 DISALLOW_COPY_AND_ASSIGN(LiveBookmarksSyncTest); |
| 74 }; | 82 }; |
| 75 | 83 |
| 76 #endif // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ | 84 #endif // CHROME_TEST_SYNC_LIVE_BOOKMARKS_SYNC_TEST_H_ |
| 77 | 85 |
| 78 #endif // CHROME_PERSONALIZATION | 86 #endif // CHROME_PERSONALIZATION |
| OLD | NEW |