chrome/browser/profiles/profile_manager_unittest.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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

« no previous file with comments | « chrome/browser/profiles/profile_manager_browsertest.cc ('k') | chrome/browser/profiles/profile_shortcut_manager_win.cc » ('j') | no next file with comments »

OLD	NEW
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/files/scoped_temp_dir.h"

10 #include "base/message_loop.h"	10 #include "base/message_loop.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

13 #include "base/values.h"	13 #include "base/values.h"

14 #include "build/build_config.h"	14 #include "build/build_config.h"

15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

16 #include "chrome/browser/browser_process.h"	16 #include "chrome/browser/browser_process.h"

17 #include "chrome/browser/chromeos/settings/cros_settings.h"	17 #include "chrome/browser/chromeos/settings/cros_settings.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_service.h"	19 #include "chrome/browser/history/history_service.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"

22 #include "chrome/browser/prefs/browser_prefs.h"	22 #include "chrome/browser/prefs/browser_prefs.h"

(...skipping 610 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
633 browser2b.reset();	633 browser2b.reset();

634 last_opened_profiles = profile_manager->GetLastOpenedProfiles();	634 last_opened_profiles = profile_manager->GetLastOpenedProfiles();

635 ASSERT_EQ(1U, last_opened_profiles.size());	635 ASSERT_EQ(1U, last_opened_profiles.size());

636 EXPECT_EQ(profile1, last_opened_profiles[0]);	636 EXPECT_EQ(profile1, last_opened_profiles[0]);

637	637

638 browser1.reset();	638 browser1.reset();

639 last_opened_profiles = profile_manager->GetLastOpenedProfiles();	639 last_opened_profiles = profile_manager->GetLastOpenedProfiles();

640 ASSERT_EQ(0U, last_opened_profiles.size());	640 ASSERT_EQ(0U, last_opened_profiles.size());

641 }	641 }

642 #endif // !defined(OS_ANDROID)	642 #endif // !defined(OS_ANDROID)

OLD	NEW