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

1 files changed, 11 insertions, 9 deletions

diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc
index bc67e7b..5cb0be8 100644
--- a/chrome/browser/extensions/webstore_installer.cc
+++ b/chrome/browser/extensions/webstore_installer.cc
@@ -66,7 +66,7 @@ const char kInvalidDownloadError[] = "Download was not a CRX";
 const char kInlineInstallSource[] = "inline";
 const char kDefaultInstallSource[] = "";
 
-FilePath* g_download_directory_for_tests = NULL;
+base::FilePath* g_download_directory_for_tests = NULL;
 
 GURL GetWebstoreInstallURL(
     const std::string& extension_id, const std::string& install_source) {
@@ -94,9 +94,9 @@ GURL GetWebstoreInstallURL(
 
 // Must be executed on the FILE thread.
 void GetDownloadFilePath(
-    const FilePath& download_directory, const std::string& id,
-    const base::Callback<void(const FilePath&)>& callback) {
-  FilePath directory(g_download_directory_for_tests ?
+    const base::FilePath& download_directory, const std::string& id,
+    const base::Callback<void(const base::FilePath&)>& callback) {
+  base::FilePath directory(g_download_directory_for_tests ?
                      *g_download_directory_for_tests : download_directory);
 
 #if defined (OS_CHROMEOS)
@@ -110,7 +110,7 @@ void GetDownloadFilePath(
   if (!file_util::DirectoryExists(directory)) {
     if (!file_util::CreateDirectory(directory)) {
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                              base::Bind(callback, FilePath()));
+                              base::Bind(callback, base::FilePath()));
       return;
     }
   }
@@ -122,7 +122,8 @@ void GetDownloadFilePath(
   std::string random_number =
       base::Uint64ToString(base::RandGenerator(kuint16max));
 
-  FilePath file = directory.AppendASCII(id + "_" + random_number + ".crx");
+  base::FilePath file =
+      directory.AppendASCII(id + "_" + random_number + ".crx");
 
   int uniquifier = file_util::GetUniquePathNumber(file, FILE_PATH_LITERAL(""));
   if (uniquifier > 0)
@@ -215,7 +216,7 @@ void WebstoreInstaller::Start() {
     return;
   }
 
-  FilePath download_path = DownloadPrefs::FromDownloadManager(
+  base::FilePath download_path = DownloadPrefs::FromDownloadManager(
       BrowserContext::GetDownloadManager(profile_))->DownloadPath();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
@@ -272,7 +273,8 @@ void WebstoreInstaller::InvalidateDelegate() {
   delegate_ = NULL;
 }
 
-void WebstoreInstaller::SetDownloadDirectoryForTests(FilePath* directory) {
+void WebstoreInstaller::SetDownloadDirectoryForTests(
+    base::FilePath* directory) {
   g_download_directory_for_tests = directory;
 }
 
@@ -342,7 +344,7 @@ void WebstoreInstaller::OnDownloadDestroyed(DownloadItem* download) {
 // reports should narrow down exactly which pointer it is.  Collapsing all the
 // early-returns into a single branch makes it hard to see exactly which pointer
 // it is.
-void WebstoreInstaller::StartDownload(const FilePath& file) {
+void WebstoreInstaller::StartDownload(const base::FilePath& file) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadManager* download_manager =