Merge in changes from readability review.

test/cctest/test-func-name-inference.cc

Index: test/cctest/test-func-name-inference.cc
diff --git a/test/cctest/test-func-name-inference.cc b/test/cctest/test-func-name-inference.cc
index d91f75fa0c5ee574ee74e0be6efb4bfa5edb12e3..1bfc8834aba321300b7b844c64a4c120a84b9ea2 100644
--- a/test/cctest/test-func-name-inference.cc
+++ b/test/cctest/test-func-name-inference.cc
@@ -32,15 +32,18 @@
 #include "cctest.h"
 
 
+using ::v8::internal::CStrVector;

[Søren Thygesen Gjesse, 2009/05/25 06:38:31]

I must admit that I would prefer to not use "using" and either use a namespace
alias or use full namespaces, but lets keep it with "using" for now and getting
rid of the  mix of "using" and namespace alias is good.

[Mikhail Naganov, 2009/05/25 08:38:51]

Honestly, me too, because when using "using" it's good to have some auto-checker
that helps to get rid of no more used imports (like the tool that track imports
for Java).

+using ::v8::internal::Factory;
 using ::v8::internal::Handle;
+using ::v8::internal::Heap;
 using ::v8::internal::JSFunction;
 using ::v8::internal::Object;
+using ::v8::internal::Runtime;
 using ::v8::internal::Script;
+using ::v8::internal::SmartPointer;
 using ::v8::internal::SharedFunctionInfo;
 using ::v8::internal::String;
 
-namespace i = ::v8::internal;
-
 
 static v8::Persistent<v8::Context> env;
 
@@ -66,19 +69,19 @@ static void CheckFunctionName(v8::Handle<v8::Script> script,
 
   // Find the position of a given func source substring in the source.
   Handle<String> func_pos_str =
-      i::Factory::NewStringFromAscii(i::CStrVector(func_pos_src));
-  int func_pos = i::Runtime::StringMatch(script_src, func_pos_str, 0);
+      Factory::NewStringFromAscii(CStrVector(func_pos_src));
+  int func_pos = Runtime::StringMatch(script_src, func_pos_str, 0);
   CHECK_NE(0, func_pos);
 
   // Obtain SharedFunctionInfo for the function.
   Object* shared_func_info_ptr =
-      i::Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
-  CHECK(shared_func_info_ptr != i::Heap::undefined_value());
+      Runtime::FindSharedFunctionInfoInScript(i_script, func_pos);
+  CHECK(shared_func_info_ptr != Heap::undefined_value());
   Handle<SharedFunctionInfo> shared_func_info(
       SharedFunctionInfo::cast(shared_func_info_ptr));
 
   // Verify inferred function name.
-  i::SmartPointer<char> inferred_name =
+  SmartPointer<char> inferred_name =
       shared_func_info->inferred_name()->ToCString();
   CHECK_EQ(ref_inferred_name, *inferred_name);
 }