FilePath: remove some functions that aren't really used.

chrome/browser/bookmarks/bookmark_node_data.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
@@ skipping 180 matching lines @@
 
   return false;
 }
 
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   return g_browser_process->clipboard()->IsFormatAvailableByString(
       BookmarkNodeData::kClipboardFormatString, ui::Clipboard::BUFFER_STANDARD);
 }
 #else
 void BookmarkNodeData::WriteToClipboard(Profile* profile) const {
-  bookmark_pasteboard_helper_mac::WriteToClipboard(elements, profile_path_);
+  bookmark_pasteboard_helper_mac::WriteToClipboard(elements,
+                                                   profile_path_.value());
 }
 
 bool BookmarkNodeData::ReadFromClipboard() {
-  return bookmark_pasteboard_helper_mac::ReadFromClipboard(elements,
-                                                           &profile_path_);
+  return bookmark_pasteboard_helper_mac::ReadFromClipboard(
+      elements, &profile_path_.value());

[tony, 2011/05/27 23:30:20]

This looks like a compile error.

[Mark Mentovai, 2011/05/27 23:39:56]

tony wrote:
Yup.

 }
 
 bool BookmarkNodeData::ReadFromDragClipboard() {
-  return bookmark_pasteboard_helper_mac::ReadFromDragClipboard(elements,
-                                                               &profile_path_);
+  // TODO(evan): bookmark_pasteboard_helper_mac should just use FilePaths.
+  FilePath::StringType buf;
+  if (!bookmark_pasteboard_helper_mac::ReadFromDragClipboard(elements, &buf))
+    return false;
+  profile_path_ = FilePath(buf);
+  return true;
 }
 
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
   return bookmark_pasteboard_helper_mac::ClipboardContainsBookmarks();
 }
 #endif  // !defined(OS_MACOSX)
 
 #if defined(TOOLKIT_VIEWS)
 void BookmarkNodeData::Write(Profile* profile, ui::OSExchangeData* data) const {
   DCHECK(data);
@@ skipping 33 matching lines @@
     if (data.GetURLAndTitle(&url, &title))
       ReadFromTuple(url, title);
   }
 
   return is_valid();
 }
 #endif
 
 void BookmarkNodeData::WriteToPickle(Profile* profile, Pickle* pickle) const {
   FilePath path = profile ? profile->GetPath() : FilePath();
-  FilePath::WriteStringTypeToPickle(pickle, path.value());
+  path.WriteToPickle(pickle);
   pickle->WriteSize(elements.size());
 
   for (size_t i = 0; i < elements.size(); ++i)
     elements[i].WriteToPickle(pickle);
 }
 
 bool BookmarkNodeData::ReadFromPickle(Pickle* pickle) {
   void* data_iterator = NULL;
   size_t element_count;
-  if (FilePath::ReadStringTypeFromPickle(pickle, &data_iterator,
-                                         &profile_path_) &&
+  if (profile_path_.ReadFromPickle(pickle, &data_iterator) &&
       pickle->ReadSize(&data_iterator, &element_count)) {
     std::vector<Element> tmp_elements;
     tmp_elements.resize(element_count);
     for (size_t i = 0; i < element_count; ++i) {
       if (!tmp_elements[i].ReadFromPickle(pickle, &data_iterator)) {
         return false;
       }
     }
     elements.swap(tmp_elements);
   }
@@ skipping 27 matching lines @@
 
 void BookmarkNodeData::Clear() {
   profile_path_.clear();
   elements.clear();
 }
 
 void BookmarkNodeData::SetOriginatingProfile(Profile* profile) {
   DCHECK(profile_path_.empty());
 
   if (profile)
-    profile_path_ = profile->GetPath().value();
+    profile_path_ = profile->GetPath();
 }
 
 bool BookmarkNodeData::IsFromProfile(Profile* profile) const {
   // An empty path means the data is not associated with any profile.
-  return !profile_path_.empty() && profile_path_ == profile->GetPath().value();
+  return !profile_path_.empty() && profile_path_ == profile->GetPath();
 }