BookmarksFunction sending response after execution in all cases

chrome/browser/extensions/api/bookmarks/bookmarks_api.cc

 // Copyright (c) 2012 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/api/bookmarks/bookmarks_api.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 81 matching lines @@
 
 bool BookmarksFunction::RunAsync() {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   if (!model->loaded()) {
     // Bookmarks are not ready yet.  We'll wait.
     model->AddObserver(this);
     AddRef();  // Balanced in Loaded().
     return true;
   }
 
-  bool success = RunOnReady();
-  if (success) {
-    content::NotificationService::current()->Notify(
-        extensions::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
-        content::Source<const Extension>(extension()),
-        content::Details<const BookmarksFunction>(this));
-  }
-  SendResponse(success);
+  RunAndSendResponse();
   return true;
 }
 
 BookmarkModel* BookmarksFunction::GetBookmarkModel() {
   return BookmarkModelFactory::GetForProfile(GetProfile());
 }
 
 ChromeBookmarkClient* BookmarksFunction::GetChromeBookmarkClient() {
   return ChromeBookmarkClientFactory::GetForProfile(GetProfile());
 }
@@ skipping 103 matching lines @@
   }
   return true;
 }
 
 void BookmarksFunction::BookmarkModelChanged() {
 }
 
 void BookmarksFunction::BookmarkModelLoaded(BookmarkModel* model,
                                             bool ids_reassigned) {
   model->RemoveObserver(this);
-  RunOnReady();
+  RunAndSendResponse();

[tfarina, 2014/10/16 19:08:25]

I don't know if it is fine to send
extensions::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED here.

[not at google - send to devlin, 2014/10/16 19:40:21]

Good point.

It looks like this notification is used by sync to do some accounting on
extension usage of bookmarks APIs. That implies that calling it here is the
right thing to do.

   Release();  // Balanced in RunOnReady().
 }
 
+void BookmarksFunction::RunAndSendResponse() {
+  bool success = RunOnReady();
+  if (success) {
+    content::NotificationService::current()->Notify(
+      extensions::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
+      content::Source<const Extension>(extension()),
+      content::Details<const BookmarksFunction>(this));
+  }
+  SendResponse(success);
+}
+
 BookmarkEventRouter::BookmarkEventRouter(Profile* profile)
     : browser_context_(profile),
       model_(BookmarkModelFactory::GetForProfile(profile)),
       client_(ChromeBookmarkClientFactory::GetForProfile(profile)) {
   model_->AddObserver(this);
 }
 
 BookmarkEventRouter::~BookmarkEventRouter() {
   if (model_) {
     model_->RemoveObserver(this);
@@ skipping 595 matching lines @@
 }
 
 void BookmarksExportFunction::FileSelected(const base::FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(GetProfile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 
 }  // namespace extensions