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

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

Issue 7465041: GTTF: Use a fresh TestingBrowserProcess for each test, part #4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update 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 15 matching lines...) Expand all
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_profile.h" 35 #include "chrome/test/base/testing_profile.h"
36 #include "chrome/test/testing_browser_process_test.h"
36 #include "content/browser/browser_thread.h" 37 #include "content/browser/browser_thread.h"
37 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
38 #include "webkit/glue/password_form.h" 39 #include "webkit/glue/password_form.h"
39 40
40 #if defined(OS_WIN) 41 #if defined(OS_WIN)
41 #include "base/win/scoped_comptr.h" 42 #include "base/win/scoped_comptr.h"
42 #include "base/win/windows_version.h" 43 #include "base/win/windows_version.h"
43 #include "chrome/browser/importer/ie_importer.h" 44 #include "chrome/browser/importer/ie_importer.h"
44 #include "chrome/browser/password_manager/ie7_password.h" 45 #include "chrome/browser/password_manager/ie7_password.h"
45 #endif 46 #endif
46 47
47 // 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
48 #if defined(OS_MACOSX) 49 #if defined(OS_MACOSX)
49 #define MAYBE(x) DISABLED_##x 50 #define MAYBE(x) DISABLED_##x
50 #else 51 #else
51 #define MAYBE(x) x 52 #define MAYBE(x) x
52 #endif 53 #endif
53 54
54 class ImporterTest : public testing::Test { 55 class ImporterTest : public TestingBrowserProcessTest {
55 public: 56 public:
56 ImporterTest() 57 ImporterTest()
57 : ui_thread_(BrowserThread::UI, &message_loop_), 58 : ui_thread_(BrowserThread::UI, &message_loop_),
58 file_thread_(BrowserThread::FILE, &message_loop_), 59 file_thread_(BrowserThread::FILE, &message_loop_),
59 profile_(new TestingProfile()) { 60 profile_(new TestingProfile()) {
60 } 61 }
61 62
62 ~ImporterTest() { 63 ~ImporterTest() {
63 profile_.reset(NULL); 64 profile_.reset(NULL);
64 } 65 }
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 true); 881 true);
881 } 882 }
882 883
883 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { 884 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) {
884 bool import_search_engines = false; 885 bool import_search_engines = false;
885 scoped_refptr<Firefox3Observer> observer( 886 scoped_refptr<Firefox3Observer> observer(
886 new Firefox3Observer(import_search_engines)); 887 new Firefox3Observer(import_search_engines));
887 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), 888 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
888 import_search_engines); 889 import_search_engines);
889 } 890 }
OLDNEW
« no previous file with comments | « chrome/browser/history/history_unittest_base.h ('k') | chrome/browser/instant/promo_counter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698