Revert of update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition

content/shell/renderer/test_runner/test_runner.cc

 // Copyright 2014 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 "content/shell/renderer/test_runner/test_runner.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "content/public/test/layouttest_support.h"
@@ skipping 87 matching lines @@
     v8::Isolate* isolate = blink::mainThreadIsolate();
     v8::HandleScope handle_scope(isolate);
     WebFrame* frame = object_->web_view_->mainFrame();
 
     v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
     if (context.IsEmpty())
       return;
 
     v8::Context::Scope context_scope(context);
 
-#ifdef WEB_FRAME_USES_V8_LOCAL
-    scoped_ptr<v8::Local<v8::Value>[]> local_argv;
-    if (argc_) {
-      local_argv.reset(new v8::Local<v8::Value>[argc_]);
-#else
     scoped_ptr<v8::Handle<v8::Value>[]> local_argv;
     if (argc_) {
         local_argv.reset(new v8::Handle<v8::Value>[argc_]);
-#endif
         for (int i = 0; i < argc_; ++i)
           local_argv[i] = v8::Local<v8::Value>::New(isolate, argv_[i]);
     }
 
     frame->callFunctionEvenIfScriptDisabled(
         v8::Local<v8::Function>::New(isolate, callback_),
         context->Global(),
         argc_,
         local_argv.get());
   }
@@ skipping 2914 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace content