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

Side by Side Diff: chrome/browser/importer/importer_unittest.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 // The order of these includes is important. 8 // The order of these includes is important.
9 #include <windows.h> 9 #include <windows.h>
10 #include <unknwn.h> 10 #include <unknwn.h>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/password_manager/ie7_password.h" 45 #include "chrome/browser/password_manager/ie7_password.h"
46 #endif 46 #endif
47 47
48 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007 48 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007
49 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
50 #define MAYBE(x) DISABLED_##x 50 #define MAYBE(x) DISABLED_##x
51 #else 51 #else
52 #define MAYBE(x) x 52 #define MAYBE(x) x
53 #endif 53 #endif
54 54
55 using content::BrowserThread;
56
55 class ImporterTest : public testing::Test { 57 class ImporterTest : public testing::Test {
56 public: 58 public:
57 ImporterTest() 59 ImporterTest()
58 : ui_thread_(BrowserThread::UI, &message_loop_), 60 : ui_thread_(BrowserThread::UI, &message_loop_),
59 file_thread_(BrowserThread::FILE, &message_loop_), 61 file_thread_(BrowserThread::FILE, &message_loop_),
60 profile_(new TestingProfile()) { 62 profile_(new TestingProfile()) {
61 } 63 }
62 64
63 ~ImporterTest() { 65 ~ImporterTest() {
64 profile_.reset(NULL); 66 profile_.reset(NULL);
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 true); 847 true);
846 } 848 }
847 849
848 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { 850 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
849 bool import_search_engines = false; 851 bool import_search_engines = false;
850 scoped_refptr<Firefox3Observer> observer( 852 scoped_refptr<Firefox3Observer> observer(
851 new Firefox3Observer(import_search_engines)); 853 new Firefox3Observer(import_search_engines));
852 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), 854 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
853 import_search_engines); 855 import_search_engines);
854 } 856 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/importer_list.cc ('k') | chrome/browser/importer/in_process_importer_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698