Make it so that chrome.bookmarks.update can update the URL of a bookmark....

chrome/browser/extensions/extension_bookmarks_module.cc

 // Copyright (c) 2009 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/extensions/extension_bookmarks_module.h"
 
 #include "base/json/json_writer.h"
 #include "base/sha1.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 220 matching lines @@
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeChanged(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(Int64ToString(node->id())));
 
-  // TODO(erikkay) The only two things that BookmarkModel sends this
-  // notification for are title and favicon.  Since we're currently ignoring
-  // favicon and since the notification doesn't say which one anyway, for now
-  // we only include title.  The ideal thing would be to change BookmarkModel
-  // to indicate what changed.
+  // TODO(erikkay) The only three things that BookmarkModel sends this
+  // notification for are title, url and favicon.  Since we're currently
+  // ignoring favicon and since the notification doesn't say which one anyway,
+  // for now we only include title and url.  The ideal thing would be to change
+  // BookmarkModel to indicate what changed.
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetString(keys::kTitleKey, node->GetTitle());
+  if (node->is_url())
+    object_args->SetString(keys::kUrlKey, node->GetURL().spec());
   args.Append(object_args);
 
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
   DispatchEvent(model->profile(), keys::kOnBookmarkChanged, json_args);
 }
 
 void ExtensionBookmarkEventRouter::BookmarkNodeFavIconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
   // TODO(erikkay) anything we should do here?
@@ skipping 374 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(ExtractIds(args_.get(), &ids, &invalid_id));
   if (invalid_id) {
     error_ = keys::kInvalidIdError;
     return false;
   }
   EXTENSION_FUNCTION_VALIDATE(ids.size() == 1);
 
   const ListValue* args = args_as_list();
   DictionaryValue* updates;
   EXTENSION_FUNCTION_VALIDATE(args->GetDictionary(1, &updates));
+
   std::wstring title;
-  updates->GetString(keys::kTitleKey, &title);  // Optional (empty is clear).
+  std::string url_string;
+
+  // Optional but we need to distinguish non present from an empty title.
+  const bool has_title = updates->GetString(keys::kTitleKey, &title);
+  updates->GetString(keys::kUrlKey, &url_string);  // Optional.
+
+  GURL url;
+  if (!url_string.empty()) {
+    url = GURL(url_string);
+
+    // If URL is present then it needs to be a non empty valid URL.
+    EXTENSION_FUNCTION_VALIDATE(!url.is_empty());
+    EXTENSION_FUNCTION_VALIDATE(url.is_valid());
+  }
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   const BookmarkNode* node = model->GetNodeByID(ids.front());
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
   if (node == model->root_node() ||
       node == model->other_node() ||
       node == model->GetBookmarkBarNode()) {
     error_ = keys::kModifySpecialError;
     return false;
   }
-  model->SetTitle(node, title);
+  if (has_title)
+    model->SetTitle(node, title);
+  if (!url.is_empty())
+    model->SetURL(node, url);
 
   DictionaryValue* ret = ExtensionBookmarks::GetNodeDictionary(node, false);
   result_.reset(ret);
 
   return true;
 }
 
 // Mapper superclass for BookmarkFunctions.
 template <typename BucketIdType>
 class BookmarkBucketMapper : public BucketMapper {
@@ skipping 163 matching lines @@
 
 void UpdateBookmarkFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   BookmarksQuotaLimitFactory::Build<UpdateBookmarkFunction>(heuristics);
 };
 
 void CreateBookmarkFunction::GetQuotaLimitHeuristics(
     QuotaLimitHeuristics* heuristics) const {
   BookmarksQuotaLimitFactory::BuildForCreate(heuristics, profile());
 }