Namespace internal extension JavaScript modules with extensions:: so that they

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"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 399 matching lines @@
       kNoFlags,
       1u,  // One error: A reference error from within the browser action.
       ACTION_BROWSER_ACTION,
       &extension);
 
   std::string script_url = extension->url().Resolve("browser_action.js").spec();
 
   const ErrorConsole::ErrorList& errors =
       error_console()->GetErrorsForExtension(extension->id());
 
+  std::string event_bindings_str =
+      base::StringPrintf("extensions::%s", kEventBindings);
+
   CheckRuntimeError(
       errors[0],
       extension->id(),
       script_url,
       false,  // not incognito
       "Error in event handler for browserAction.onClicked: "
           "ReferenceError: baz is not defined",
       logging::LOG_ERROR,
       extension->url().Resolve(kBackgroundPageName),
       6u);
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
 
   CheckStackFrame(stack_trace[0], script_url, kAnonymousFunction);
   CheckStackFrame(stack_trace[1],
                   "extensions::SafeBuiltins",
                   std::string("Function.target.") + kAnonymousFunction);
   CheckStackFrame(
-      stack_trace[2], kEventBindings, "Event.dispatchToListener");
-  CheckStackFrame(stack_trace[3], kEventBindings, "Event.dispatch_");
-  CheckStackFrame(stack_trace[4], kEventBindings, "dispatchArgs");
-  CheckStackFrame(stack_trace[5], kEventBindings, "dispatchEvent");
+      stack_trace[2], event_bindings_str, "Event.dispatchToListener");
+  CheckStackFrame(stack_trace[3], event_bindings_str, "Event.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,
       &extension);
 
   const ErrorConsole::ErrorList& errors =
       error_console()->GetErrorsForExtension(extension->id());
 
+  std::string schema_utils_str =
+      base::StringPrintf("extensions::%s", kSchemaUtils);
+
   CheckRuntimeError(
       errors[0],
       extension->id(),
-      kSchemaUtils,  // API calls are checked in schemaUtils.js.
+      schema_utils_str,  // API calls are checked in schemaUtils.js.
       false,  // not incognito
       "Uncaught Error: Invocation of form "
           "tabs.get(string, function) doesn't match definition "
           "tabs.get(integer tabId, function callback)",
       logging::LOG_ERROR,
       extension->url().Resolve(kBackgroundPageName),
       1u);
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
   ASSERT_EQ(1u, stack_trace.size());
   CheckStackFrame(stack_trace[0],
-                  kSchemaUtils,
+                  schema_utils_str,
                   kAnonymousFunction);
 }
 
 // Test that we catch an error when we try to call an API method without
 // permission.
 IN_PROC_BROWSER_TEST_F(ErrorConsoleBrowserTest, BadAPIPermissionsRuntimeError) {
   const Extension* extension = NULL;
   LoadExtensionAndCheckErrors(
       "bad_api_permissions_runtime_error",
       kNoFlags,
@@ skipping 19 matching lines @@
 
   const StackTrace& stack_trace = GetStackTraceFromError(errors[0]);
   ASSERT_EQ(1u, stack_trace.size());
   CheckStackFrame(stack_trace[0],
                   script_url,
                   kAnonymousFunction,
                   5u, 1u);
 }
 
 }  // namespace extensions