Fixing cross-incognito dispatch of onFocusChanged event.

chrome/browser/extensions/window_event_router.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/window_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 121 matching lines @@
   focused_profile_ = window_profile;
   focused_window_id_ = window_id;
 
   scoped_ptr<base::ListValue> real_args(new ListValue());
   real_args->Append(Value::CreateIntegerValue(window_id));
 
   // When switching between windows in the default and incognito profiles,
   // dispatch WINDOW_ID_NONE to extensions whose profile lost focus that
   // can't see the new focused window across the incognito boundary.
   // See crbug.com/46610.
-  scoped_ptr<base::ListValue> none_args(new ListValue());
+  scoped_ptr<base::ListValue> none_args(NULL);
   if (focused_profile_ != NULL && previous_focused_profile != NULL &&
       focused_profile_ != previous_focused_profile) {
-    none_args->Append(
-        Value::CreateIntegerValue(extension_misc::kUnknownWindowId));
+    none_args.reset(new ListValue());
+    none_args->Append(Value::CreateIntegerValue(
+        extension_misc::kUnknownWindowId));
   }
 
   // Note that we may pass a NULL |window_profile| for the |restrict_to_profile|
   // argument.
   ExtensionSystem::Get(profile_)->event_router()->
       DispatchEventsToRenderersAcrossIncognito(
           event_names::kOnWindowFocusedChanged,
           real_args.Pass(),
           window_profile,
           none_args.Pass(),
           GURL());
 }
 
 void WindowEventRouter::DispatchEvent(const char* event_name,
                                       Profile* profile,
                                       scoped_ptr<base::ListValue> args) {
   ExtensionSystem::Get(profile)->event_router()->
       DispatchEventToRenderers(event_name, args.Pass(), profile, GURL());
 }
 
 }  // namespace extensions