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

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

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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) 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 "chrome/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/version.h"
11 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/profiles/chrome_version_service.h" 13 #include "chrome/browser/profiles/chrome_version_service.h"
13 #include "chrome/browser/profiles/profile_impl.h" 14 #include "chrome/browser/profiles/profile_impl.h"
14 #include "chrome/browser/profiles/startup_task_runner_service.h" 15 #include "chrome/browser/profiles/startup_task_runner_service.h"
15 #include "chrome/browser/profiles/startup_task_runner_service_factory.h" 16 #include "chrome/browser/profiles/startup_task_runner_service_factory.h"
16 #include "chrome/common/chrome_constants.h" 17 #include "chrome/common/chrome_constants.h"
17 #include "chrome/common/chrome_version_info.h" 18 #include "chrome/common/chrome_version_info.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "chrome/test/base/in_process_browser_test.h" 20 #include "chrome/test/base/in_process_browser_test.h"
20 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 std::string final_value(prefs->GetString(prefs::kSessionExitType)); 244 std::string final_value(prefs->GetString(prefs::kSessionExitType));
244 EXPECT_EQ(crash_value, final_value); 245 EXPECT_EQ(crash_value, final_value);
245 246
246 // This test runs fast enough that the WebDataService may still be 247 // This test runs fast enough that the WebDataService may still be
247 // initializing (which uses the temp directory) when the test 248 // initializing (which uses the temp directory) when the test
248 // ends. Give it a chance to complete. 249 // ends. Give it a chance to complete.
249 profile.reset(); 250 profile.reset();
250 content::RunAllPendingInMessageLoop(); 251 content::RunAllPendingInMessageLoop();
251 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); 252 content::RunAllPendingInMessageLoop(content::BrowserThread::DB);
252 } 253 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_version_service.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698