PPAPI: Move PPB_Console out of dev.

ppapi/shared_impl/ppapi_globals.h

 // Copyright (c) 2012 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.
 
 #ifndef PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 #define PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
-#include "ppapi/c/dev/ppb_console_dev.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_module.h"
+#include "ppapi/c/ppb_console.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace base {
 class Lock;
 class MessageLoopProxy;
 }
 
 namespace ppapi {
 
@@ skipping 46 matching lines @@
   virtual ResourceTracker* GetResourceTracker() = 0;
   virtual VarTracker* GetVarTracker() = 0;
   virtual CallbackTracker* GetCallbackTrackerForInstance(
       PP_Instance instance) = 0;
 
   virtual base::Lock* GetProxyLock() = 0;
 
   // Logs the given string to the JS console. If "source" is empty, the name of
   // the current module will be used, if it can be determined.
   virtual void LogWithSource(PP_Instance instance,
-                             PP_LogLevel_Dev level,
+                             PP_LogLevel level,
                              const std::string& source,
                              const std::string& value) = 0;
 
   // Like LogWithSource but broadcasts the log to all instances of the given
   // module. The module may be 0 to specify that all consoles possibly
   // associated with the calling code should be notified. This allows us to
   // log errors for things like bad resource IDs where we may not have an
   // associated instance.
   //
   // Note that in the plugin process, the module parameter is ignored since
   // there is only one possible one.
   virtual void BroadcastLogWithSource(PP_Module module,
-                                      PP_LogLevel_Dev level,
+                                      PP_LogLevel level,
                                       const std::string& source,
                                       const std::string& value) = 0;
 
   // Returns the given API object associated with the given instance, or NULL
   // if the instance is invalid.
   virtual thunk::PPB_Instance_API* GetInstanceAPI(PP_Instance instance) = 0;
   virtual thunk::ResourceCreationAPI* GetResourceCreationAPI(
       PP_Instance instance) = 0;
 
   // Returns the PP_Module associated with the given PP_Instance, or 0 on
@@ skipping 29 matching lines @@
   static PpapiGlobals* ppapi_globals_;
 
   scoped_refptr<base::MessageLoopProxy> main_loop_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(PpapiGlobals);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPAPI_GLOBALS_H_