Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods

content/browser/idbbindingutilities_browsertest.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/utility_process_host.h"
 #include "content/common/indexed_db_key.h"
 #include "content/common/utility_messages.h"
+#include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/serialized_script_value.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "webkit/glue/idb_bindings.h"
 #include "webkit/glue/web_io_operators.h"
-#include "webkit/glue/webkitplatformsupport_impl.h"
 
 using content::BrowserThread;
 using WebKit::WebSerializedScriptValue;
 
 // Enables calling WebKit::shutdown no matter where a "return" happens.
 class ScopedShutdownWebKit {
  public:
   ScopedShutdownWebKit() {
   }
 
   ~ScopedShutdownWebKit() {
     WebKit::shutdown();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedShutdownWebKit);
 };
 
 // Sanity test, check the function call directly outside the sandbox.
 TEST(IDBKeyPathWithoutSandbox, Value) {
-  webkit_glue::WebKitPlatformSupportImpl webkit_platform_support;
+  content::WebKitPlatformSupportImpl webkit_platform_support;
   WebKit::initialize(&webkit_platform_support);
   ScopedShutdownWebKit shutdown_webkit;
 
   char16 data[] = {0x0353,0x6f66,0x536f,0x7a03,0x6f6f,0x017b};
   std::vector<WebSerializedScriptValue> serialized_values;
   serialized_values.push_back(
       WebSerializedScriptValue::fromString(string16(data, arraysize(data))));
   serialized_values.push_back(
       WebSerializedScriptValue::fromString(string16()));
 
@@ skipping 310 matching lines @@
   ScopedIDBKeyPathHelper scoped_helper;
   scoped_helper.SetExpectedValue(expected_value);
   // TODO(lukezarko@gmail.com): re-enable this after the changes described at
   //     https://bugs.webkit.org/show_bug.cgi?id=63481 land.
   // scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar"));
 
   // Expect null.
   scoped_helper.SetExpectedValue(content::SerializedScriptValue());
   scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bad.key.path"));
 }