Unify logic of stack trace generation for extension errors

chrome/browser/extensions/error_console/error_console_browsertest.cc

 // Copyright 2013 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/error_console/error_console.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/stringprintf.h"
@@ skipping 430 matching lines @@
 
   std::string event_dispatch_to_listener_str =
       base::StringPrintf("Event.publicClass.%s [as dispatchToListener]",
                          kAnonymousFunction);
 
   CheckRuntimeError(
       errors[0],
       extension->id(),
       script_url,
       false,  // not incognito
-      "Error in event handler for browserAction.onClicked: baz is not defined\n"
-          "Stack trace: ReferenceError: baz is not defined",
+      "Error in event handler for browserAction.onClicked: ReferenceError: "
+          "baz is not defined",
       logging::LOG_ERROR,
       extension->url().Resolve(kBackgroundPageName),
-      6u);
+      1u);
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
+  // Note: This test used to have a stack trace of length 6 that contains stack
+  // frames in the extension code, but since crbug.com/404406 was fixed only
+  // stack frames within user-defined extension code are printed.
 
   CheckStackFrame(stack_trace[0], script_url, kAnonymousFunction);
-  CheckStackFrame(stack_trace[1], event_bindings_str,
-                  "EventImpl.dispatchToListener");
-  CheckStackFrame(stack_trace[2], "extensions::utils",
-                  event_dispatch_to_listener_str);
-  CheckStackFrame(stack_trace[3], event_bindings_str, "EventImpl.dispatch_");
-  CheckStackFrame(stack_trace[4], event_bindings_str, "dispatchArgs");
-  CheckStackFrame(stack_trace[5], event_bindings_str, "dispatchEvent");
 }
 
 // Test that we can catch an error for calling an API with improper arguments.
 IN_PROC_BROWSER_TEST_F(ErrorConsoleBrowserTest, BadAPIArgumentsRuntimeError) {
   const Extension* extension = NULL;
   LoadExtensionAndCheckErrors(
       "bad_api_arguments_runtime_error",
       kNoFlags,
       1,  // One error: call an API with improper arguments.
       ACTION_NONE,
@@ skipping 102 matching lines @@
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
   ASSERT_EQ(1u, stack_trace.size());
   CheckStackFrame(stack_trace[0],
                   script_url,
                   kAnonymousFunction,
                   12u, 20u);
 }
 
 }  // namespace extensions