Revert of Separate Scope into DeclarationScope and Scope

test/cctest/compiler/test-loop-assignment-analysis.cc

 // Copyright 2014 the V8 project 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 "src/ast/scopes.h"
 #include "src/compiler/ast-loop-assignment-analyzer.h"
 #include "src/parsing/parser.h"
 #include "src/parsing/rewriter.h"
 #include "test/cctest/cctest.h"
 
@@ skipping 19 matching lines @@
 
   void CheckLoopAssignedCount(int expected, const char* var_name) {
     // TODO(titzer): don't scope analyze every single time.
     ParseInfo parse_info(main_zone(), function);
     CompilationInfo info(&parse_info, function);
 
     CHECK(Parser::ParseStatic(&parse_info));
     CHECK(Rewriter::Rewrite(&parse_info));
     CHECK(Scope::Analyze(&parse_info));
 
-    DeclarationScope* scope = info.literal()->scope();
+    Scope* scope = info.literal()->scope();
     AstValueFactory* factory = parse_info.ast_value_factory();
     CHECK(scope);
 
     if (result == NULL) {
       AstLoopAssignmentAnalyzer analyzer(main_zone(), &info);
       result = analyzer.Analyze();
       CHECK(result);
     }
 
     const i::AstRawString* name = factory->GetOneByteString(var_name);
@@ skipping 240 matching lines @@
 
   f.CheckLoopAssignedCount(1, "x");
   f.CheckLoopAssignedCount(3, "y");
   f.CheckLoopAssignedCount(5, "z");
   f.CheckLoopAssignedCount(0, "w");
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8