Commit 650b2d5c authored by brettw@chromium.org's avatar brettw@chromium.org

Merge branch 'master' into file_path_browser

version control markers

Merge branch 'master' into file_path_browser

remove version control

Fix typo

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/intents/native_services_browsertest.cc
	chrome/browser/ui/intents/native_file_picker_service.cc

Merge branch 'master' into file_path_browser

Conflicts:
	chrome/browser/chromeos/drive/drive_file_system.cc
	chrome/browser/chromeos/drive/drive_file_system.h
	chrome/browser/chromeos/drive/drive_file_system_interface.h
	chrome/browser/chromeos/drive/drive_file_system_unittest.cc
	chrome/browser/chromeos/drive/file_system/drive_operations.cc
	chrome/browser/chromeos/login/wallpaper_manager.cc
	chrome/browser/chromeos/login/wallpaper_manager.h
	chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
	chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
	chrome/browser/google_apis/gdata_wapi_operations.cc
	chrome/browser/google_apis/gdata_wapi_operations.h
	chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
	chrome/browser/profiles/off_the_record_profile_impl.cc
	chrome/browser/profiles/off_the_record_profile_impl.h
	chrome/browser/profiles/profile_impl.cc
	chrome/browser/profiles/profile_impl.h
	chrome/browser/profiles/profile_impl_io_data.cc
	chrome/browser/profiles/profile_impl_io_data.h
	chrome/browser/sync_file_system/drive_file_sync_client_unittest.cc
	chrome/browser/ui/webui/options/manage_profile_handler.cc

Long lines

long lines

some long lines.

long lines

long lines

Beginning of lines.

Rename FilePath -> base::FilePath in chrome/browser

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181638 0039d316-1c4b-4281-b951-d872f2087c98
parent 6f363870
......@@ -59,7 +59,7 @@ CrashDumpManager::~CrashDumpManager() {
int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::PROCESS_LAUNCHER));
FilePath minidump_path;
base::FilePath minidump_path;
if (!file_util::CreateTemporaryFile(&minidump_path))
return base::kInvalidPlatformFileValue;
......@@ -83,7 +83,7 @@ int CrashDumpManager::CreateMinidumpFile(int child_process_id) {
return minidump_file;
}
void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
int64 file_size = 0;
......@@ -101,7 +101,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
// We are dealing with a valid minidump. Copy it to the crash report
// directory from where Java code will upload it later on.
FilePath crash_dump_dir;
base::FilePath crash_dump_dir;
r = PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
if (!r) {
NOTREACHED() << "Failed to retrieve the crash dump directory.";
......@@ -112,7 +112,7 @@ void CrashDumpManager::ProcessMinidump(const FilePath& minidump_path,
const std::string filename =
base::StringPrintf("chromium-renderer-minidump-%016" PRIx64 ".dmp%d",
rand, pid);
FilePath dest_path = crash_dump_dir.Append(filename);
base::FilePath dest_path = crash_dump_dir.Append(filename);
r = file_util::Move(minidump_path, dest_path);
if (!r) {
LOG(ERROR) << "Failed to move crash dump from " << minidump_path.value()
......@@ -153,7 +153,7 @@ void CrashDumpManager::Observe(int type,
NOTREACHED();
return;
}
FilePath minidump_path;
base::FilePath minidump_path;
{
base::AutoLock auto_lock(child_process_id_to_minidump_path_lock_);
ChildProcessIDToMinidumpPath::iterator iter =
......
......@@ -45,9 +45,9 @@ class CrashDumpManager : public content::NotificationObserver {
// Should be created on the UI thread.
CrashDumpManager();
typedef std::map<int, FilePath> ChildProcessIDToMinidumpPath;
typedef std::map<int, base::FilePath> ChildProcessIDToMinidumpPath;
static void ProcessMinidump(const FilePath& minidump_path,
static void ProcessMinidump(const base::FilePath& minidump_path,
base::ProcessHandle pid);
// NotificationObserver implementation:
......
......@@ -56,8 +56,8 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
return use_bundled_frontend_resources_;
}
virtual FilePath GetDebugFrontendDir() {
return FilePath();
virtual base::FilePath GetDebugFrontendDir() {
return base::FilePath();
}
virtual std::string GetPageThumbnailData(const GURL& url) {
......
......@@ -157,7 +157,7 @@ void RecordLastRunAppBundlePath() {
// real, user-visible app bundle directory. (The alternatives give either the
// framework's path or the initial app's path, which may be an app mode shim
// or a unit test.)
FilePath appBundlePath =
base::FilePath appBundlePath =
chrome::GetVersionedDirectory().DirName().DirName().DirName();
CFPreferencesSetAppValue(
base::mac::NSToCFCast(app_mode::kLastRunAppBundlePathPrefsKey),
......@@ -1022,7 +1022,7 @@ void RecordLastRunAppBundlePath() {
int return_code;
StartupBrowserCreator browser_creator;
browser_creator.LaunchBrowser(
command_line, [self lastProfile], FilePath(),
command_line, [self lastProfile], base::FilePath(),
chrome::startup::IS_NOT_PROCESS_STARTUP,
chrome::startup::IS_NOT_FIRST_RUN, &return_code);
}
......@@ -1126,7 +1126,7 @@ void RecordLastRunAppBundlePath() {
CommandLine dummy(CommandLine::NO_PROGRAM);
chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
StartupBrowserCreatorImpl launch(FilePath(), dummy, first_run);
StartupBrowserCreatorImpl launch(base::FilePath(), dummy, first_run);
launch.OpenURLsInBrowser(browser, false, urls);
}
......@@ -1151,7 +1151,7 @@ void RecordLastRunAppBundlePath() {
stringValue];
ProfileManager* profileManager = g_browser_process->profile_manager();
FilePath path = FilePath(base::SysNSStringToUTF8(profileDir));
base::FilePath path = base::FilePath(base::SysNSStringToUTF8(profileDir));
path = profileManager->user_data_dir().Append(path);
Profile* profile = profileManager->GetProfile(path);
if (!profile) {
......@@ -1192,7 +1192,7 @@ void RecordLastRunAppBundlePath() {
string16 printTicket16 = base::SysNSStringToUTF16(printTicket);
print_dialog_cloud::CreatePrintDialogForFile(
ProfileManager::GetDefaultProfile(), NULL,
FilePath([inputPath UTF8String]), title16,
base::FilePath([inputPath UTF8String]), title16,
printTicket16, [mime UTF8String], /*delete_on_close=*/false);
}
}
......@@ -1201,7 +1201,8 @@ void RecordLastRunAppBundlePath() {
openFiles:(NSArray*)filenames {
std::vector<GURL> gurlVector;
for (NSString* file in filenames) {
GURL gurl = net::FilePathToFileURL(FilePath(base::SysNSStringToUTF8(file)));
GURL gurl =
net::FilePathToFileURL(base::FilePath(base::SysNSStringToUTF8(file)));
gurlVector.push_back(gurl);
}
if (!gurlVector.empty())
......
......@@ -255,8 +255,9 @@ class AutofillTest : public InProcessBrowserTest {
CHECK(test_server()->Start());
std::string data;
FilePath data_file = ui_test_utils::GetTestFilePath(
FilePath().AppendASCII("autofill"), FilePath().AppendASCII(filename));
base::FilePath data_file =
ui_test_utils::GetTestFilePath(base::FilePath().AppendASCII("autofill"),
base::FilePath().AppendASCII(filename));
CHECK(file_util::ReadFileToString(data_file, &data));
std::vector<std::string> lines;
base::SplitString(data, '\n', &lines);
......
......@@ -20,8 +20,8 @@
namespace {
const FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
const FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
const base::FilePath::CharType kTestName[] = FILE_PATH_LITERAL("merge");
const base::FilePath::CharType kFileNamePattern[] = FILE_PATH_LITERAL("*.in");
const char kFieldSeparator[] = ": ";
const char kProfileSeparator[] = "---";
......
......@@ -14,7 +14,7 @@ namespace {
// Reads |file| into |content|, and converts Windows line-endings to Unix ones.
// Returns true on success.
bool ReadFile(const FilePath& file, std::string* content) {
bool ReadFile(const base::FilePath& file, std::string* content) {
if (!file_util::ReadFileToString(file, content))
return false;
......@@ -23,7 +23,7 @@ bool ReadFile(const FilePath& file, std::string* content) {
}
// Write |content| to |file|. Returns true on success.
bool WriteFile(const FilePath& file, const std::string& content) {
bool WriteFile(const base::FilePath& file, const std::string& content) {
int write_size = file_util::WriteFile(file, content.c_str(),
content.length());
return write_size == static_cast<int>(content.length());
......@@ -32,15 +32,15 @@ bool WriteFile(const FilePath& file, const std::string& content) {
} // namespace
void DataDrivenTest::RunDataDrivenTest(
const FilePath& input_directory,
const FilePath& output_directory,
const FilePath::StringType& file_name_pattern) {
const base::FilePath& input_directory,
const base::FilePath& output_directory,
const base::FilePath::StringType& file_name_pattern) {
file_util::FileEnumerator input_files(input_directory,
false,
file_util::FileEnumerator::FILES,
file_name_pattern);
for (FilePath input_file = input_files.Next();
for (base::FilePath input_file = input_files.Next();
!input_file.empty();
input_file = input_files.Next()) {
SCOPED_TRACE(input_file.BaseName().value());
......@@ -51,7 +51,7 @@ void DataDrivenTest::RunDataDrivenTest(
std::string output;
GenerateResults(input, &output);
FilePath output_file = output_directory.Append(
base::FilePath output_file = output_directory.Append(
input_file.BaseName().StripTrailingSeparators().ReplaceExtension(
FILE_PATH_LITERAL(".out")));