Fix callback for chrome.tabs.update with javascript URLs.

chrome/browser/extensions/extension_tabs_module.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
 class BackingStore;
 class SkBitmap;
-
 namespace base {
 class DictionaryValue;
 }  // namespace base
-
+namespace content {
+class WebContents;
+}  // namespace content
 // Windows
 class GetWindowFunction : public SyncExtensionFunction {
   virtual ~GetWindowFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.get")
 };
 class GetCurrentWindowFunction : public SyncExtensionFunction {
   virtual ~GetCurrentWindowFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getCurrent")
@@ skipping 69 matching lines @@
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.highlight")
 };
 class UpdateTabFunction : public AsyncExtensionFunction,
                           public content::WebContentsObserver {
  public:
   UpdateTabFunction();
  private:
   virtual ~UpdateTabFunction() {}
   virtual bool RunImpl() OVERRIDE;
+  virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   void OnExecuteCodeFinished(int request_id,
                              bool success,
                              const std::string& error);
+  void PopulateResult();
+
+  content::WebContents* web_contents_;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.update")
 };
 class MoveTabsFunction : public SyncExtensionFunction {
   virtual ~MoveTabsFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.move")
 };
 class ReloadTabFunction : public SyncExtensionFunction {
   virtual ~ReloadTabFunction() {}
   virtual bool RunImpl() OVERRIDE;
@@ skipping 41 matching lines @@
   // The format (JPEG vs PNG) of the resulting image.  Set in RunImpl().
   ImageFormat image_format_;
 
   // Quality setting to use when encoding jpegs.  Set in RunImpl().
   int image_quality_;
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.captureVisibleTab")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__