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

Side by Side Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/profiles/profile_browsertest.cc ('k') | chrome/browser/rlz/rlz_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/scoped_temp_dir.h"
9 #include "base/message_loop.h" 10 #include "base/message_loop.h"
10 #include "base/path_service.h" 11 #include "base/path_service.h"
11 #include "base/scoped_temp_dir.h"
12 #include "base/system_monitor/system_monitor.h" 12 #include "base/system_monitor/system_monitor.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "build/build_config.h" 15 #include "build/build_config.h"
16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/extensions/event_router_forwarder.h" 18 #include "chrome/browser/extensions/event_router_forwarder.h"
19 #include "chrome/browser/history/history.h" 19 #include "chrome/browser/history/history.h"
20 #include "chrome/browser/history/history_service_factory.h" 20 #include "chrome/browser/history/history_service_factory.h"
21 #include "chrome/browser/io_thread.h" 21 #include "chrome/browser/io_thread.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 } 124 }
125 125
126 #if defined(OS_CHROMEOS) 126 #if defined(OS_CHROMEOS)
127 // Do not change order of stub_cros_enabler_, which needs to be constructed 127 // Do not change order of stub_cros_enabler_, which needs to be constructed
128 // before io_thread_ which requires CrosLibrary to be initialized to construct 128 // before io_thread_ which requires CrosLibrary to be initialized to construct
129 // its data member pref_proxy_config_tracker_ on ChromeOS. 129 // its data member pref_proxy_config_tracker_ on ChromeOS.
130 chromeos::ScopedStubCrosEnabler stub_cros_enabler_; 130 chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
131 #endif 131 #endif
132 132
133 // The path to temporary directory used to contain the test operations. 133 // The path to temporary directory used to contain the test operations.
134 ScopedTempDir temp_dir_; 134 base::ScopedTempDir temp_dir_;
135 ScopedTestingLocalState local_state_; 135 ScopedTestingLocalState local_state_;
136 scoped_refptr<extensions::EventRouterForwarder> 136 scoped_refptr<extensions::EventRouterForwarder>
137 extension_event_router_forwarder_; 137 extension_event_router_forwarder_;
138 138
139 MessageLoopForUI message_loop_; 139 MessageLoopForUI message_loop_;
140 content::TestBrowserThread ui_thread_; 140 content::TestBrowserThread ui_thread_;
141 content::TestBrowserThread db_thread_; 141 content::TestBrowserThread db_thread_;
142 content::TestBrowserThread file_thread_; 142 content::TestBrowserThread file_thread_;
143 // IOThread is necessary for the creation of some services below. 143 // IOThread is necessary for the creation of some services below.
144 IOThread io_thread_; 144 IOThread io_thread_;
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 browser2b.reset(); 559 browser2b.reset();
560 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); 560 last_opened_profiles = profile_manager->GetLastOpenedProfiles();
561 ASSERT_EQ(1U, last_opened_profiles.size()); 561 ASSERT_EQ(1U, last_opened_profiles.size());
562 EXPECT_EQ(profile1, last_opened_profiles[0]); 562 EXPECT_EQ(profile1, last_opened_profiles[0]);
563 563
564 browser1.reset(); 564 browser1.reset();
565 last_opened_profiles = profile_manager->GetLastOpenedProfiles(); 565 last_opened_profiles = profile_manager->GetLastOpenedProfiles();
566 ASSERT_EQ(0U, last_opened_profiles.size()); 566 ASSERT_EQ(0U, last_opened_profiles.size());
567 } 567 }
568 #endif // !defined(OS_ANDROID) 568 #endif // !defined(OS_ANDROID)
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_browsertest.cc ('k') | chrome/browser/rlz/rlz_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698