Clean up the file dev interfaces. The combination of some dev and some non

ppapi/cpp/dev/file_chooser_dev.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 "ppapi/cpp/dev/file_chooser_dev.h"
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
-#include "ppapi/cpp/dev/file_ref_dev.h"
+#include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
 namespace pp {
 
 namespace {
 
 template <> const char* interface_name<PPB_FileChooser_Dev>() {
   return PPB_FILECHOOSER_DEV_INTERFACE;
@@ skipping 13 matching lines @@
     : Resource(other) {
 }
 
 int32_t FileChooser_Dev::Show(const CompletionCallback& cc) {
   if (!has_interface<PPB_FileChooser_Dev>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
   return get_interface<PPB_FileChooser_Dev>()->Show(
       pp_resource(), cc.pp_completion_callback());
 }
 
-FileRef_Dev FileChooser_Dev::GetNextChosenFile() const {
+FileRef FileChooser_Dev::GetNextChosenFile() const {
   if (!has_interface<PPB_FileChooser_Dev>())
-    return FileRef_Dev();
-  return FileRef_Dev(FileRef_Dev::PassRef(),
+    return FileRef();
+  return FileRef(FileRef::PassRef(),
       get_interface<PPB_FileChooser_Dev>()->GetNextChosenFile(pp_resource()));
 }
 
 }  // namespace pp