chrome/browser/diagnostics/diagnostics_controller_unittest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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/diagnostics/diagnostics_controller_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 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

« no previous file with comments | « chrome/browser/devtools/devtools_file_system_indexer.cc ('k') | chrome/browser/diagnostics/recon_diagnostics.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/diagnostics/diagnostics_controller.h"	5 #include "chrome/browser/diagnostics/diagnostics_controller.h"

6	6

7 #include "base/base_paths.h"	7 #include "base/base_paths.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/file_util.h"	9 #include "base/files/file_util.h"

10 #include "base/files/scoped_temp_dir.h"	10 #include "base/files/scoped_temp_dir.h"

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

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

13 #include "chrome/browser/diagnostics/diagnostics_model.h"	13 #include "chrome/browser/diagnostics/diagnostics_model.h"

14 #include "chrome/browser/diagnostics/diagnostics_writer.h"	14 #include "chrome/browser/diagnostics/diagnostics_writer.h"

15 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"	15 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"

16 #include "chrome/common/chrome_paths.h"	16 #include "chrome/common/chrome_paths.h"

17 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

18 #include "chromeos/chromeos_constants.h"	18 #include "chromeos/chromeos_constants.h"

19 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
151 EXPECT_EQ(DiagnosticsModel::TEST_FAIL_CONTINUE, info->GetResult());	151 EXPECT_EQ(DiagnosticsModel::TEST_FAIL_CONTINUE, info->GetResult());

152 EXPECT_EQ(DIAG_SQLITE_ERROR_HANDLER_CALLED, info->GetOutcomeCode());	152 EXPECT_EQ(DIAG_SQLITE_ERROR_HANDLER_CALLED, info->GetOutcomeCode());

153	153

154 DiagnosticsController::GetInstance()->RunRecovery(cmdline_, writer_.get());	154 DiagnosticsController::GetInstance()->RunRecovery(cmdline_, writer_.get());

155 EXPECT_EQ(DiagnosticsModel::RECOVERY_OK, info->GetResult());	155 EXPECT_EQ(DiagnosticsModel::RECOVERY_OK, info->GetResult());

156 EXPECT_FALSE(base::PathExists(db_path));	156 EXPECT_FALSE(base::PathExists(db_path));

157 }	157 }

158 #endif	158 #endif

159	159

160 } // namespace diagnostics	160 } // namespace diagnostics

OLD	NEW