Move systemInfo.cpu API out out experimental namespace.

chrome/browser/extensions/api/system_info/system_info_api.cc

 // Copyright 2013 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 "chrome/browser/extensions/api/system_info/system_info_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/system_info_cpu/cpu_info_provider.h"
 #include "chrome/browser/extensions/api/system_info_storage/storage_info_provider.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
-#include "chrome/common/extensions/api/experimental_system_info_cpu.h"
 #include "chrome/common/extensions/api/experimental_system_info_storage.h"
+#include "chrome/common/extensions/api/system_info_cpu.h"
 #include "ui/gfx/display_observer.h"
 
 #if defined(USE_ASH)
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #endif
 
 namespace extensions {
 
-using api::experimental_system_info_cpu::CpuUpdateInfo;
+using api::system_info_cpu::CpuUpdateInfo;
 using api::experimental_system_info_storage::StorageUnitInfo;
 using api::experimental_system_info_storage::StorageUnitType;
 using api::experimental_system_info_storage::StorageChangeInfo;
 using content::BrowserThread;
 
 namespace {
 
 // The display events use the "systemInfo" prefix.
 const char kSystemInfoEventPrefix[] = "systemInfo";
 // The storage and cpu events still use the "experimental.systemInfo" prefix.
@@ skipping 50 matching lines @@
   void DispatchEvent(const std::string& event_name,
       scoped_ptr<base::ListValue> args);
 
   // The callbacks of querying storage info to start and stop watching the
   // storages. Called from UI thread.
   void StartWatchingStorages(const StorageInfo& info, bool success);
   void StopWatchingStorages(const StorageInfo& info, bool success);
 
   // The callback for CPU sampling cycle. Called from FILE thread.
   void OnNextCpuSampling(
-      scoped_ptr<api::experimental_system_info_cpu::CpuUpdateInfo> info);
+      scoped_ptr<api::system_info_cpu::CpuUpdateInfo> info);
 
   // Called to dispatch the systemInfo.display.onDisplayChanged event.
   void OnDisplayChanged();
 
   // Used to record the event names being watched.
   std::multiset<std::string> watching_event_set_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemInfoEventRouter);
 };
 
@@ skipping 203 matching lines @@
 
 void SystemInfoAPI::OnListenerAdded(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->AddEventListener(details.event_name);
 }
 
 void SystemInfoAPI::OnListenerRemoved(const EventListenerInfo& details) {
   SystemInfoEventRouter::GetInstance()->RemoveEventListener(details.event_name);
 }
 
 }  // namespace extensions