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

7 files changed, 13 insertions, 12 deletions

diff --git a/chrome/browser/parsers/metadata_parser_filebase.cc b/chrome/browser/parsers/metadata_parser_filebase.cc
index 9105fe3..56207e1 100644
--- a/chrome/browser/parsers/metadata_parser_filebase.cc
+++ b/chrome/browser/parsers/metadata_parser_filebase.cc
@@ -8,7 +8,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 
-FileMetadataParser::FileMetadataParser(const FilePath& path)
+FileMetadataParser::FileMetadataParser(const base::FilePath& path)
     : MetadataParser(path),
       path_(path) {
 }
diff --git a/chrome/browser/parsers/metadata_parser_filebase.h b/chrome/browser/parsers/metadata_parser_filebase.h
index 4309959..1a8fa7d 100644
--- a/chrome/browser/parsers/metadata_parser_filebase.h
+++ b/chrome/browser/parsers/metadata_parser_filebase.h
@@ -18,7 +18,7 @@ typedef base::hash_map<std::string, std::string> PropertyMap;
 // properties associated with files.
 class FileMetadataParser : public MetadataParser {
  public:
-  explicit FileMetadataParser(const FilePath& path);
+  explicit FileMetadataParser(const base::FilePath& path);
 
   virtual ~FileMetadataParser();
 
@@ -30,7 +30,7 @@ class FileMetadataParser : public MetadataParser {
 
  protected:
   PropertyMap properties_;
-  FilePath path_;
+  base::FilePath path_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FileMetadataParser);
diff --git a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc
index 99fc871..0dc6237 100644
--- a/chrome/browser/parsers/metadata_parser_filebase_unittest.cc
+++ b/chrome/browser/parsers/metadata_parser_filebase_unittest.cc
@@ -46,7 +46,7 @@ class FileMetaDataParserTest : public testing::Test {
   }
 
   base::ScopedTempDir temp_dir_;
-  FilePath test_file_;
+  base::FilePath test_file_;
 };
 
 TEST_F(FileMetaDataParserTest, Parse) {
diff --git a/chrome/browser/parsers/metadata_parser_jpeg.cc b/chrome/browser/parsers/metadata_parser_jpeg.cc
index 3e78978..4018af5 100644
--- a/chrome/browser/parsers/metadata_parser_jpeg.cc
+++ b/chrome/browser/parsers/metadata_parser_jpeg.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/parsers/metadata_parser_jpeg.h"
 
-JpegMetadataParser::JpegMetadataParser(const FilePath& path)
+JpegMetadataParser::JpegMetadataParser(const base::FilePath& path)
     : FileMetadataParser(path) {}
 
 bool JpegMetadataParser::Parse() {
diff --git a/chrome/browser/parsers/metadata_parser_jpeg.h b/chrome/browser/parsers/metadata_parser_jpeg.h
index d1a3fb0..fcb232c 100644
--- a/chrome/browser/parsers/metadata_parser_jpeg.h
+++ b/chrome/browser/parsers/metadata_parser_jpeg.h
@@ -9,7 +9,7 @@
 
 class JpegMetadataParser : public FileMetadataParser {
  public:
-  explicit JpegMetadataParser(const FilePath& path);
+  explicit JpegMetadataParser(const base::FilePath& path);
   // Implementation of MetadataParser
   virtual bool Parse() OVERRIDE;
 
diff --git a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc
index 5793984..16021c2 100644
--- a/chrome/browser/parsers/metadata_parser_jpeg_factory.cc
+++ b/chrome/browser/parsers/metadata_parser_jpeg_factory.cc
@@ -12,18 +12,19 @@ MetadataParserJpegFactory::MetadataParserJpegFactory()
     : MetadataParserFactory() {
 }
 
-bool MetadataParserJpegFactory::CanParse(const FilePath& path,
+bool MetadataParserJpegFactory::CanParse(const base::FilePath& path,
                                          char* bytes,
                                          int bytes_size) {
 #if defined(OS_WIN)
-  FilePath::StringType ext = UTF8ToWide(std::string(".jpg"));
+  base::FilePath::StringType ext = UTF8ToWide(std::string(".jpg"));
 #elif defined(OS_POSIX)
-  FilePath::StringType ext = ".jpg";
+  base::FilePath::StringType ext = ".jpg";
 #endif
   return path.MatchesExtension(ext);
 }
 
-MetadataParser* MetadataParserJpegFactory::CreateParser(const FilePath& path) {
+MetadataParser* MetadataParserJpegFactory::CreateParser(
+    const base::FilePath& path) {
   JpegMetadataParser* parser;
   parser = new JpegMetadataParser(path);
   return parser;
diff --git a/chrome/browser/parsers/metadata_parser_manager.cc b/chrome/browser/parsers/metadata_parser_manager.cc
index 8336d23..1b10f98 100644
--- a/chrome/browser/parsers/metadata_parser_manager.cc
+++ b/chrome/browser/parsers/metadata_parser_manager.cc
@@ -34,8 +34,8 @@ MetadataParserManager::MetadataParserManager() {
 
 MetadataParserManager::~MetadataParserManager() {}
 
-MetadataParser* MetadataParserManager::GetParserForFile(const FilePath& path) {
-
+MetadataParser* MetadataParserManager::GetParserForFile(
+    const base::FilePath& path) {
   char buffer[kAmountToRead];
   int amount_read = 0;
   DLOG(ERROR) << path.value();