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

8 files changed, 21 insertions, 21 deletions

diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index aba1347..7ae6cab 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -297,9 +297,9 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) {
 }
 
 TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
-  FilePath test_data_directory;
+  base::FilePath test_data_directory;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory));
-  FilePath test_file = test_data_directory.AppendASCII(
+  base::FilePath test_file = test_data_directory.AppendASCII(
       "bookmarks/model_without_sync.json");
   ASSERT_TRUE(file_util::PathExists(test_file));
 
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 58a8071..93beb36 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -89,7 +89,7 @@ const size_t kIndentSize = 4;
 class Writer : public base::RefCountedThreadSafe<Writer> {
  public:
   Writer(base::Value* bookmarks,
-         const FilePath& path,
+         const base::FilePath& path,
          BookmarkFaviconFetcher::URLFaviconMap* favicons_map,
          BookmarksExportObserver* observer)
       : bookmarks_(bookmarks),
@@ -363,7 +363,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
   scoped_ptr<Value> bookmarks_;
 
   // Path we're writing to.
-  FilePath path_;
+  base::FilePath path_;
 
   // Map that stores favicon per URL.
   scoped_ptr<BookmarkFaviconFetcher::URLFaviconMap> favicons_map_;
@@ -385,7 +385,7 @@ class Writer : public base::RefCountedThreadSafe<Writer> {
 
 BookmarkFaviconFetcher::BookmarkFaviconFetcher(
     Profile* profile,
-    const FilePath& path,
+    const base::FilePath& path,
     BookmarksExportObserver* observer)
     : profile_(profile),
       path_(path),
@@ -495,7 +495,7 @@ void BookmarkFaviconFetcher::OnFaviconDataAvailable(
 namespace bookmark_html_writer {
 
 void WriteBookmarks(Profile* profile,
-                    const FilePath& path,
+                    const base::FilePath& path,
                     BookmarksExportObserver* observer) {
   // BookmarkModel isn't thread safe (nor would we want to lock it down
   // for the duration of the write), as such we make a copy of the
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index ddc669e..47d004e 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -43,7 +43,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
       URLFaviconMap;
 
   BookmarkFaviconFetcher(Profile* profile,
-                         const FilePath& path,
+                         const base::FilePath& path,
                          BookmarksExportObserver* observer);
   virtual ~BookmarkFaviconFetcher();
 
@@ -86,7 +86,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
   scoped_ptr<URLFaviconMap> favicons_map_;
 
   // Path where html output is stored.
-  FilePath path_;
+  base::FilePath path_;
 
   BookmarksExportObserver* observer_;
 
@@ -103,7 +103,7 @@ namespace bookmark_html_writer {
 // Before writing to the file favicons are fetched on the main thread.
 // TODO(sky): need a callback on failure.
 void WriteBookmarks(Profile* profile,
-                    const FilePath& path,
+                    const base::FilePath& path,
                     BookmarksExportObserver* observer);
 
 }  // namespace bookmark_html_writer
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 282141b..4d26f56 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -119,7 +119,7 @@ class BookmarkHTMLWriterTest : public testing::Test {
   }
 
   base::ScopedTempDir temp_dir_;
-  FilePath path_;
+  base::FilePath path_;
 };
 
 // Class that will notify message loop when file is written.
diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc
index d1e39df..58672e1 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.cc
+++ b/chrome/browser/bookmarks/bookmark_node_data.cc
@@ -208,7 +208,7 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
 }
 
 bool BookmarkNodeData::ReadFromClipboard() {
-  FilePath file_path;
+  base::FilePath file_path;
   if (!bookmark_pasteboard_helper_mac::ReadFromPasteboard(
       bookmark_pasteboard_helper_mac::kCopyPastePasteboard,
       elements,
@@ -221,7 +221,7 @@ bool BookmarkNodeData::ReadFromClipboard() {
 }
 
 bool BookmarkNodeData::ReadFromDragClipboard() {
-  FilePath file_path;
+  base::FilePath file_path;
   if (!bookmark_pasteboard_helper_mac::ReadFromPasteboard(
       bookmark_pasteboard_helper_mac::kDragPasteboard,
       elements,
@@ -284,7 +284,7 @@ bool BookmarkNodeData::Read(const ui::OSExchangeData& data) {
 #endif
 
 void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const {
-  FilePath path = profile ? profile->GetPath() : FilePath();
+  base::FilePath path = profile ? profile->GetPath() : base::FilePath();
   path.WriteToPickle(pickle);
   pickle->WriteUInt64(elements.size());
 
diff --git a/chrome/browser/bookmarks/bookmark_node_data.h b/chrome/browser/bookmarks/bookmark_node_data.h
index ac2a77d..8bf61a62 100644
--- a/chrome/browser/bookmarks/bookmark_node_data.h
+++ b/chrome/browser/bookmarks/bookmark_node_data.h
@@ -161,7 +161,7 @@ struct BookmarkNodeData {
 
  private:
   // Path of the profile we originated from.
-  FilePath profile_path_;
+  base::FilePath profile_path_;
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_NODE_DATA_H_
diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
index 591b60a..c32ee8e 100644
--- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
+++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm
@@ -242,7 +242,7 @@ namespace bookmark_pasteboard_helper_mac {
 
 void WriteToPasteboard(PasteboardType type,
                        const std::vector<BookmarkNodeData::Element>& elements,
-                       const FilePath& profile_path) {
+                       const base::FilePath& profile_path) {
   if (elements.empty())
     return;
 
@@ -264,12 +264,12 @@ void WriteToPasteboard(PasteboardType type,
 
 bool ReadFromPasteboard(PasteboardType type,
                         std::vector<BookmarkNodeData::Element>& elements,
-                        FilePath* profile_path) {
+                        base::FilePath* profile_path) {
   NSPasteboard* pb = PasteboardFromType(type);
 
   elements.clear();
   NSString* profile = [pb stringForType:kChromiumProfilePathPboardType];
-  *profile_path = FilePath(base::SysNSStringToUTF8(profile));
+  *profile_path = base::FilePath(base::SysNSStringToUTF8(profile));
   return ReadBookmarkDictionaryListPboardType(pb, elements) ||
          ReadWebURLsWithTitlesPboardType(pb, elements) ||
          ReadNSURLPboardType(pb, elements);
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index c4dee86..d42a51a 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -26,13 +26,13 @@ using content::BrowserThread;
 namespace {
 
 // Extension used for backup files (copy of main file created during startup).
-const FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
+const base::FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
 
 // How often we save.
 const int kSaveDelayMS = 2500;
 
-void BackupCallback(const FilePath& path) {
-  FilePath backup_path = path.ReplaceExtension(kBackupExtension);
+void BackupCallback(const base::FilePath& path) {
+  base::FilePath backup_path = path.ReplaceExtension(kBackupExtension);
   file_util::CopyFile(path, backup_path);
 }
 
@@ -48,7 +48,7 @@ void AddBookmarksToIndex(BookmarkLoadDetails* details,
   }
 }
 
-void LoadCallback(const FilePath& path,
+void LoadCallback(const base::FilePath& path,
                   BookmarkStorage* storage,
                   BookmarkLoadDetails* details) {
   startup_metric_utils::ScopedSlowStartupUMA