Revert of Further refine div output when a div receives focus

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

Index: chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
index b2dbd612750de40d84b80df6fe3d2bbdb3289214..f049a6d8fe2610f0392fbf6622a45668bdebad79 100644
--- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js
@@ -9,7 +9,6 @@
 goog.provide('Output');
 goog.provide('Output.EventType');
 
-goog.require('AutomationTreeWalker');
 goog.require('EarconEngine');
 goog.require('Spannable');
 goog.require('Stubs');
@@ -448,7 +447,7 @@
     },
     div: {
       enter: '$nameFromNode',
-      speak: '$nameOrTextContent $description'
+      speak: '$name $description $descendants'
     },
     embeddedObject: {
       speak: '$name'
@@ -538,7 +537,7 @@
       speak: '$if($name, $name, $docUrl)'
     },
     region: {
-      speak: '$nameOrTextContent'
+      speak: '$descendants'
     },
     row: {
       enter: '$node(tableRowHeader)'
@@ -1200,20 +1199,6 @@
             return;
           var related = node[tree.firstChild.value];
           this.node_(related, related, Output.EventType.NAVIGATE, buff);
-        } else if (token == 'nameOrTextContent') {
-          if (node.name) {
-            this.format_(node, '$name', buff);
-          } else {
-            var walker = new AutomationTreeWalker(node,
-                Dir.FORWARD,
-                {visit: AutomationPredicate.leafOrStaticText,
-                 leaf: AutomationPredicate.leafOrStaticText});
-            while (walker.next().node &&
-                walker.phase == AutomationTreeWalkerPhase.DESCENDANT) {
-              if (walker.node.name)
-                this.append_(buff, walker.node.name, options);
-            }
-          }
         } else if (node[token] !== undefined) {
           options.annotation.push(token);
           var value = node[token];