Move c/b/e/*idle* to c/b/e/api/idle/

TBR=jhawkins@chromium.org

BUG=101244


Review URL: https://chromiumcodereview.appspot.com/10750016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149108 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_idle_api.cc → chrome/browser/extensions/api/idle/idle_api.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_idle_api.h"
+#include "chrome/browser/extensions/api/idle/idle_api.h"
 
 #include <algorithm>
 #include <map>
@@ -16,13 +16,17 @@
 #include "base/time.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/extensions/extension_idle_api_constants.h"
+#include "chrome/browser/extensions/api/idle/idle_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/render_view_host.h"
 
-namespace keys = extension_idle_api_constants;
+using extensions::ExtensionIdleCache;
+using extensions::ExtensionIdleEventRouter;
+using extensions::ExtensionIdleQueryStateFunction;
+
+namespace keys = extensions::idle_api_constants;
 
 namespace {
 
@@ -78,7 +82,8 @@ bool ExtensionIdlePollingTask::poll_task_running_ = false;
 void ExtensionIdlePollingTask::IdleStateCallback(IdleState current_state) {
   // If we just came into an active state, notify the extension.
   if (IDLE_STATE_ACTIVE == current_state && last_state_ != current_state)
-    ExtensionIdleEventRouter::OnIdleStateChange(profile_, current_state);
+    ExtensionIdleEventRouter::OnIdleStateChange(profile_,
+                                                            current_state);
 
   ExtensionIdlePollingTask::poll_task_running_ = false;
 
@@ -134,7 +139,7 @@ int CheckThresholdBounds(int timeout) {
   return timeout;
 }
 
-};  // namespace
+}  // namespace
 
 void ExtensionIdleEventRouter::OnIdleStateChange(Profile* profile,
                                                  IdleState state) {

chrome/browser/extensions/extension_idle_api.h → chrome/browser/extensions/api/idle/idle_api.h

@@ -2,14 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_H_
 
+#include "base/gtest_prod_util.h"
 #include "chrome/browser/idle.h"
 #include "chrome/browser/extensions/extension_function.h"
 
 class Profile;
 
+FORWARD_DECLARE_TEST(ExtensionIdleApiTest, CacheTest);
+
+namespace extensions {
+
 // Event router class for events related to the idle API.
 class ExtensionIdleEventRouter {
  public:
@@ -41,7 +46,7 @@ class ExtensionIdleCache {
   static void UpdateCache(int threshold, IdleState state);
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(ExtensionIdleApiTest, CacheTest);
+  FRIEND_TEST_ALL_PREFIXES(::ExtensionIdleApiTest, CacheTest);
 
   struct CacheData {
     // Latest moment in history after which we are certain that there was some
@@ -80,4 +85,6 @@ class ExtensionIdleCache {
   static CacheData cached_data;
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_H_
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_H_

chrome/browser/extensions/extension_idle_api_constants.cc → chrome/browser/extensions/api/idle/idle_api_constants.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/browser/extensions/extension_idle_api_constants.h"
+#include "chrome/browser/extensions/api/idle/idle_api_constants.h"
 
-namespace extension_idle_api_constants {
+namespace extensions {
+
+namespace idle_api_constants {
 
 const char kSecondsKey[] = "seconds";
 const char kStateKey[] = "state";
@@ -15,4 +17,6 @@ const char kStateActive[] = "active";
 const char kStateIdle[] = "idle";
 const char kStateLocked[] = "locked";
 
-}  // namespace extension_idle_api_constants
+}  // namespace idle_api_constants
+
+}  // namespace extensions

chrome/browser/extensions/extension_idle_api_constants.h → chrome/browser/extensions/api/idle/idle_api_constants.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_CONSTANTS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_CONSTANTS_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_CONSTANTS_H_
+#define CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_CONSTANTS_H_
 
-namespace extension_idle_api_constants {
+namespace extensions {
+
+namespace idle_api_constants {
 
 // Keys.
 extern const char kSecondsKey[];
@@ -19,6 +21,8 @@ extern const char kStateActive[];
 extern const char kStateIdle[];
 extern const char kStateLocked[];
 
-};  // namespace extension_idle_api_constants
+}  // namespace idle_api_constants
+
+}  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_IDLE_API_CONSTANTS_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_IDLE_IDLE_API_CONSTANTS_H_

chrome/browser/extensions/extension_idle_api_unittest.cc → chrome/browser/extensions/api/idle/idle_api_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #include <gtest/gtest.h>
 
-#include "chrome/browser/extensions/extension_idle_api.h"
+#include "chrome/browser/extensions/api/idle/idle_api.h"
+
+using extensions::ExtensionIdleCache;
 
 TEST(ExtensionIdleApiTest, CacheTest) {
   double throttle_interval = ExtensionIdleCache::get_throttle_interval();

chrome/browser/extensions/extension_function_registry.cc

@@ -18,6 +18,9 @@
 #include "chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api.h"
 #include "chrome/browser/extensions/api/extension_action/extension_script_badge_api.h"
+#include "chrome/browser/extensions/api/identity/identity_api.h"
+#include "chrome/browser/extensions/api/i18n/i18n_api.h"
+#include "chrome/browser/extensions/api/idle/idle_api.h"
 #include "chrome/browser/extensions/api/managed_mode/managed_mode_api.h"
 #include "chrome/browser/extensions/api/metrics/metrics.h"
 #include "chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h"
@@ -36,8 +39,6 @@
 #include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 #include "chrome/browser/extensions/extension_font_settings_api.h"
-#include "chrome/browser/extensions/api/i18n/i18n_api.h"
-#include "chrome/browser/extensions/extension_idle_api.h"
 #include "chrome/browser/extensions/extension_management_api.h"
 #include "chrome/browser/extensions/extension_module.h"
 #include "chrome/browser/extensions/extension_preference_api.h"
@@ -197,7 +198,7 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<SearchHistoryFunction>();
 
   // Idle
-  RegisterFunction<ExtensionIdleQueryStateFunction>();
+  RegisterFunction<extensions::ExtensionIdleQueryStateFunction>();
 
   // I18N.
   RegisterFunction<GetAcceptLanguagesFunction>();

chrome/chrome_browser_extensions.gypi

@@ -156,6 +156,8 @@
         'browser/extensions/api/extension_action/extension_script_badge_api.h',
         'browser/extensions/api/file_system/file_system_api.cc',
         'browser/extensions/api/file_system/file_system_api.h',
+        'browser/extensions/api/idle/idle_api_constants.cc',
+        'browser/extensions/api/idle/idle_api_constants.h',
         'browser/extensions/api/idltest/idltest_api.cc',
         'browser/extensions/api/idltest/idltest_api.h',
         'browser/extensions/api/identity/identity_api.cc',
@@ -323,8 +325,6 @@
         'browser/extensions/extension_host_mac.mm',
         'browser/extensions/extension_icon_manager.cc',
         'browser/extensions/extension_icon_manager.h',
-        'browser/extensions/extension_idle_api_constants.cc',
-        'browser/extensions/extension_idle_api_constants.h',
         'browser/extensions/extension_info_map.cc',
         'browser/extensions/extension_info_map.h',
         'browser/extensions/extension_info_private_api_chromeos.cc',
@@ -547,6 +547,8 @@
         }],
         ['enable_extensions==1', {
           'sources': [
+            'browser/extensions/api/idle/idle_api.cc',
+            'browser/extensions/api/idle/idle_api.h',
             'browser/extensions/api/chrome_auth_private/chrome_auth_private_api.cc',
             'browser/extensions/api/chrome_auth_private/chrome_auth_private_api.h',
             'browser/extensions/api/page_capture/page_capture_api.cc',
@@ -573,8 +575,6 @@
             'browser/extensions/api/webstore_private/webstore_private_api.h',
             'browser/extensions/extension_font_settings_api.cc',
             'browser/extensions/extension_font_settings_api.h',
-            'browser/extensions/extension_idle_api.cc',
-            'browser/extensions/extension_idle_api.h',
             'browser/extensions/extension_input_api.cc',
             'browser/extensions/extension_input_api.h',
             'browser/extensions/extension_input_method_api.cc',

chrome/chrome_tests.gypi

@@ -1216,6 +1216,7 @@
         'browser/extensions/api/discovery/discovery_api_unittest.cc',
         'browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc',
         'browser/extensions/api/identity/web_auth_flow_unittest.cc',
+        'browser/extensions/api/idle/idle_api_unittest.cc',
         'browser/extensions/api/omnibox/omnibox_unittest.cc',
         'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
         'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
@@ -1242,7 +1243,6 @@
         'browser/extensions/extension_function_test_utils.cc',
         'browser/extensions/extension_function_test_utils.h',
         'browser/extensions/extension_icon_manager_unittest.cc',
-        'browser/extensions/extension_idle_api_unittest.cc',
         'browser/extensions/extension_info_map_unittest.cc',
         'browser/extensions/extension_pref_value_map_unittest.cc',
         'browser/extensions/extension_prefs_unittest.cc',
@@ -2084,7 +2084,6 @@
         ['enable_extensions==0', {
           'sources/': [
             ['exclude', '^browser/extensions/api/'],
-            ['exclude', '^browser/extensions/extension_idle_api_unittest.cc'],
             ['exclude', '^browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc'],
           ],
         }],
@@ -2713,6 +2712,7 @@
         'browser/extensions/api/file_system/file_system_apitest.cc',
         'browser/extensions/api/i18n/i18n_apitest.cc',
         'browser/extensions/api/identity/identity_apitest.cc',
+        'browser/extensions/api/idle/idle_apitest.cc',
         'browser/extensions/api/idltest/idltest_apitest.cc',
         'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
         'browser/extensions/api/managed_mode/managed_mode_apitest.cc',
@@ -2769,7 +2769,6 @@
         'browser/extensions/extension_geolocation_apitest.cc',
         'browser/extensions/extension_get_views_apitest.cc',
         'browser/extensions/extension_icon_source_apitest.cc',
-        'browser/extensions/extension_idle_apitest.cc',
         'browser/extensions/extension_incognito_apitest.cc',
         'browser/extensions/extension_info_private_apitest_chromeos.cc',
         'browser/extensions/extension_input_apitest.cc',