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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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 | 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 14 matching lines...) Expand all
25 #include "base/string_util.h" 25 #include "base/string_util.h"
26 #include "base/utf_string_conversions.h" 26 #include "base/utf_string_conversions.h"
27 #include "base/win/scoped_com_initializer.h" 27 #include "base/win/scoped_com_initializer.h"
28 #include "chrome/browser/history/history_types.h" 28 #include "chrome/browser/history/history_types.h"
29 #include "chrome/browser/importer/importer_bridge.h" 29 #include "chrome/browser/importer/importer_bridge.h"
30 #include "chrome/browser/importer/importer_data_types.h" 30 #include "chrome/browser/importer/importer_data_types.h"
31 #include "chrome/browser/importer/importer_host.h" 31 #include "chrome/browser/importer/importer_host.h"
32 #include "chrome/browser/importer/importer_progress_observer.h" 32 #include "chrome/browser/importer/importer_progress_observer.h"
33 #include "chrome/browser/search_engines/template_url.h" 33 #include "chrome/browser/search_engines/template_url.h"
34 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
35 #include "chrome/test/base/testing_browser_process_test.h"
36 #include "chrome/test/base/testing_profile.h" 35 #include "chrome/test/base/testing_profile.h"
37 #include "content/browser/browser_thread.h" 36 #include "content/browser/browser_thread.h"
38 #include "testing/gtest/include/gtest/gtest.h" 37 #include "testing/gtest/include/gtest/gtest.h"
39 #include "webkit/glue/password_form.h" 38 #include "webkit/glue/password_form.h"
40 39
41 #if defined(OS_WIN) 40 #if defined(OS_WIN)
42 #include "base/win/scoped_comptr.h" 41 #include "base/win/scoped_comptr.h"
43 #include "base/win/windows_version.h" 42 #include "base/win/windows_version.h"
44 #include "chrome/browser/importer/ie_importer.h" 43 #include "chrome/browser/importer/ie_importer.h"
45 #include "chrome/browser/password_manager/ie7_password.h" 44 #include "chrome/browser/password_manager/ie7_password.h"
46 #endif 45 #endif
47 46
48 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007 47 // TODO(estade): some of these are disabled on mac. http://crbug.com/48007
49 #if defined(OS_MACOSX) 48 #if defined(OS_MACOSX)
50 #define MAYBE(x) DISABLED_##x 49 #define MAYBE(x) DISABLED_##x
51 #else 50 #else
52 #define MAYBE(x) x 51 #define MAYBE(x) x
53 #endif 52 #endif
54 53
55 class ImporterTest : public TestingBrowserProcessTest { 54 class ImporterTest : public testing::Test {
56 public: 55 public:
57 ImporterTest() 56 ImporterTest()
58 : ui_thread_(BrowserThread::UI, &message_loop_), 57 : ui_thread_(BrowserThread::UI, &message_loop_),
59 file_thread_(BrowserThread::FILE, &message_loop_), 58 file_thread_(BrowserThread::FILE, &message_loop_),
60 profile_(new TestingProfile()) { 59 profile_(new TestingProfile()) {
61 } 60 }
62 61
63 ~ImporterTest() { 62 ~ImporterTest() {
64 profile_.reset(NULL); 63 profile_.reset(NULL);
65 } 64 }
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 true); 880 true);
882 } 881 }
883 882
884 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { 883 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
885 bool import_search_engines = false; 884 bool import_search_engines = false;
886 scoped_refptr<Firefox3Observer> observer( 885 scoped_refptr<Firefox3Observer> observer(
887 new Firefox3Observer(import_search_engines)); 886 new Firefox3Observer(import_search_engines));
888 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), 887 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
889 import_search_engines); 888 import_search_engines);
890 } 889 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698