Moving test_api to api/test .

BUG=101244
TEST=N/A, only moving code, no change in functionality


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

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

12 files changed, 81 insertions, 64 deletions

diff --git a/chrome/browser/extensions/extension_apitest_apitest.cc b/chrome/browser/extensions/api/test/apitest_apitest.cc
index 7ec15e8..385a8d0 100644
--- a/chrome/browser/extensions/extension_apitest_apitest.cc
+++ b/chrome/browser/extensions/api/test/apitest_apitest.cc
@@ -1,4 +1,4 @@
-// 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.
 
diff --git a/chrome/browser/extensions/extension_test_api.cc b/chrome/browser/extensions/api/test/test_api.cc
index a496678..03cc46d 100644
--- a/chrome/browser/extensions/extension_test_api.cc
+++ b/chrome/browser/extensions/api/test/test_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_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 
 #include <string>
 
@@ -21,7 +21,7 @@ namespace {
 
 // If you see this error in your test, you need to set the config state
 // to be returned by chrome.test.getConfig().  Do this by calling
-// ExtensionTestGetConfigFunction::set_test_config_state(Value* state)
+// TestGetConfigFunction::set_test_config_state(Value* state)
 // in test set up.
 const char kNoTestConfigDataError[] = "Test configuration was not set.";
 
@@ -30,6 +30,8 @@ const char kNotTestProcessError[] =
 
 }  // namespace
 
+namespace extensions {
+
 TestExtensionFunction::~TestExtensionFunction() {}
 
 void TestExtensionFunction::Run() {
@@ -41,9 +43,9 @@ void TestExtensionFunction::Run() {
   SendResponse(RunImpl());
 }
 
-ExtensionTestPassFunction::~ExtensionTestPassFunction() {}
+TestNotifyPassFunction::~TestNotifyPassFunction() {}
 
-bool ExtensionTestPassFunction::RunImpl() {
+bool TestNotifyPassFunction::RunImpl() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_TEST_PASSED,
       content::Source<Profile>(dispatcher()->profile()),
@@ -51,9 +53,9 @@ bool ExtensionTestPassFunction::RunImpl() {
   return true;
 }
 
-ExtensionTestFailFunction::~ExtensionTestFailFunction() {}
+TestFailFunction::~TestFailFunction() {}
 
-bool ExtensionTestFailFunction::RunImpl() {
+bool TestFailFunction::RunImpl() {
   std::string message;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &message));
   content::NotificationService::current()->Notify(
@@ -63,18 +65,18 @@ bool ExtensionTestFailFunction::RunImpl() {
   return true;
 }
 
-ExtensionTestLogFunction::~ExtensionTestLogFunction() {}
+TestLogFunction::~TestLogFunction() {}
 
-bool ExtensionTestLogFunction::RunImpl() {
+bool TestLogFunction::RunImpl() {
   std::string message;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &message));
   VLOG(1) << message;
   return true;
 }
 
-ExtensionTestQuotaResetFunction::~ExtensionTestQuotaResetFunction() {}
+TestResetQuotaFunction::~TestResetQuotaFunction() {}
 
-bool ExtensionTestQuotaResetFunction::RunImpl() {
+bool TestResetQuotaFunction::RunImpl() {
   ExtensionService* service = profile()->GetExtensionService();
   ExtensionsQuotaService* quota = service->quota_service();
   quota->Purge();
@@ -82,53 +84,53 @@ bool ExtensionTestQuotaResetFunction::RunImpl() {
   return true;
 }
 
-ExtensionTestCreateIncognitoTabFunction::
-   ~ExtensionTestCreateIncognitoTabFunction() {}
+TestCreateIncognitoTabFunction::
+   ~TestCreateIncognitoTabFunction() {}
 
-bool ExtensionTestCreateIncognitoTabFunction::RunImpl() {
+bool TestCreateIncognitoTabFunction::RunImpl() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
   chrome::OpenURLOffTheRecord(profile(), GURL(url));
   return true;
 }
 
-bool ExtensionTestSendMessageFunction::RunImpl() {
+bool TestSendMessageFunction::RunImpl() {
   std::string message;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &message));
   AddRef();  // balanced in Reply
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
-      content::Source<ExtensionTestSendMessageFunction>(this),
+      content::Source<TestSendMessageFunction>(this),
       content::Details<std::string>(&message));
   return true;
 }
-ExtensionTestSendMessageFunction::~ExtensionTestSendMessageFunction() {}
+TestSendMessageFunction::~TestSendMessageFunction() {}
 
-void ExtensionTestSendMessageFunction::Reply(const std::string& message) {
+void TestSendMessageFunction::Reply(const std::string& message) {
   result_.reset(Value::CreateStringValue(message));
   SendResponse(true);
   Release();  // balanced in RunImpl
 }
 
 // static
-void ExtensionTestGetConfigFunction::set_test_config_state(
+void TestGetConfigFunction::set_test_config_state(
     DictionaryValue* value) {
   TestConfigState* test_config_state = TestConfigState::GetInstance();
   test_config_state->set_config_state(value);
 }
 
-ExtensionTestGetConfigFunction::TestConfigState::TestConfigState()
+TestGetConfigFunction::TestConfigState::TestConfigState()
   : config_state_(NULL) {}
 
 // static
-ExtensionTestGetConfigFunction::TestConfigState*
-ExtensionTestGetConfigFunction::TestConfigState::GetInstance() {
+TestGetConfigFunction::TestConfigState*
+TestGetConfigFunction::TestConfigState::GetInstance() {
   return Singleton<TestConfigState>::get();
 }
 
-ExtensionTestGetConfigFunction::~ExtensionTestGetConfigFunction() {}
+TestGetConfigFunction::~TestGetConfigFunction() {}
 
-bool ExtensionTestGetConfigFunction::RunImpl() {
+bool TestGetConfigFunction::RunImpl() {
   TestConfigState* test_config_state = TestConfigState::GetInstance();
 
   if (!test_config_state->config_state()) {
@@ -139,3 +141,5 @@ bool ExtensionTestGetConfigFunction::RunImpl() {
   result_.reset(test_config_state->config_state()->DeepCopy());
   return true;
 }
+
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_test_api.h b/chrome/browser/extensions/api/test/test_api.h
index 518a807..3886385 100644
--- a/chrome/browser/extensions/extension_test_api.h
+++ b/chrome/browser/extensions/api/test/test_api.h
@@ -2,8 +2,8 @@
 // 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_TEST_API_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_API_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_TEST_TEST_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_TEST_TEST_API_H_
 #pragma once
 
 #include "base/values.h"
@@ -11,6 +11,8 @@
 
 template <typename T> struct DefaultSingletonTraits;
 
+namespace extensions {
+
 // A function that is only available in tests.
 // Prior to running, checks that we are in an extension process.
 class TestExtensionFunction : public SyncExtensionFunction {
@@ -21,62 +23,62 @@ class TestExtensionFunction : public SyncExtensionFunction {
   virtual void Run() OVERRIDE;
 };
 
-class ExtensionTestPassFunction : public TestExtensionFunction {
+class TestNotifyPassFunction : public TestExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.notifyPass")
 
  protected:
-  virtual ~ExtensionTestPassFunction();
+  virtual ~TestNotifyPassFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestFailFunction : public TestExtensionFunction {
+class TestFailFunction : public TestExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.notifyFail")
 
  protected:
-  virtual ~ExtensionTestFailFunction();
+  virtual ~TestFailFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestLogFunction : public TestExtensionFunction {
+class TestLogFunction : public TestExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.log")
 
  protected:
-  virtual ~ExtensionTestLogFunction();
+  virtual ~TestLogFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestQuotaResetFunction : public TestExtensionFunction {
+class TestResetQuotaFunction : public TestExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.resetQuota")
 
  protected:
-  virtual ~ExtensionTestQuotaResetFunction();
+  virtual ~TestResetQuotaFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestCreateIncognitoTabFunction : public TestExtensionFunction {
+class TestCreateIncognitoTabFunction : public TestExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.createIncognitoTab")
 
  protected:
-  virtual ~ExtensionTestCreateIncognitoTabFunction();
+  virtual ~TestCreateIncognitoTabFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestSendMessageFunction : public AsyncExtensionFunction {
+class TestSendMessageFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.sendMessage")
 
@@ -85,13 +87,13 @@ class ExtensionTestSendMessageFunction : public AsyncExtensionFunction {
   void Reply(const std::string& message);
 
  protected:
-  virtual ~ExtensionTestSendMessageFunction();
+  virtual ~TestSendMessageFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class ExtensionTestGetConfigFunction : public SyncExtensionFunction {
+class TestGetConfigFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("test.getConfig")
 
@@ -125,10 +127,12 @@ class ExtensionTestGetConfigFunction : public SyncExtensionFunction {
     DISALLOW_COPY_AND_ASSIGN(TestConfigState);
   };
 
-  virtual ~ExtensionTestGetConfigFunction();
+  virtual ~TestGetConfigFunction();
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_API_H_
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_API_TEST_TEST_API_H_
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc
index 26241e7..4a8390d 100644
--- a/chrome/browser/extensions/extension_apitest.cc
+++ b/chrome/browser/extensions/extension_apitest.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile.h"
@@ -102,11 +102,12 @@ void ExtensionApiTest::SetUpInProcessBrowserTestFixture() {
   test_config_.reset(new DictionaryValue());
   test_config_->SetString(kTestDataDirectory,
                           net::FilePathToFileURL(test_data_dir_).spec());
-  ExtensionTestGetConfigFunction::set_test_config_state(test_config_.get());
+  extensions::TestGetConfigFunction::set_test_config_state(
+      test_config_.get());
 }
 
 void ExtensionApiTest::TearDownInProcessBrowserTestFixture() {
-  ExtensionTestGetConfigFunction::set_test_config_state(NULL);
+  extensions::TestGetConfigFunction::set_test_config_state(NULL);
   test_config_.reset(NULL);
 }
 
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index 96deac5..146941b 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/extensions/api/socket/socket_api.h"
 #include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
@@ -44,7 +45,6 @@
 #include "chrome/browser/extensions/extension_page_capture_api.h"
 #include "chrome/browser/extensions/extension_preference_api.h"
 #include "chrome/browser/extensions/extension_processes_api.h"
-#include "chrome/browser/extensions/extension_test_api.h"
 #include "chrome/browser/extensions/settings/settings_api.h"
 #include "chrome/browser/extensions/system/system_api.h"
 #include "chrome/browser/history/history_extension_api.h"
@@ -233,13 +233,13 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<extensions::GetAllCookieStoresFunction>();
 
   // Test.
-  RegisterFunction<ExtensionTestPassFunction>();
-  RegisterFunction<ExtensionTestFailFunction>();
-  RegisterFunction<ExtensionTestLogFunction>();
-  RegisterFunction<ExtensionTestQuotaResetFunction>();
-  RegisterFunction<ExtensionTestCreateIncognitoTabFunction>();
-  RegisterFunction<ExtensionTestSendMessageFunction>();
-  RegisterFunction<ExtensionTestGetConfigFunction>();
+  RegisterFunction<extensions::TestNotifyPassFunction>();
+  RegisterFunction<extensions::TestFailFunction>();
+  RegisterFunction<extensions::TestLogFunction>();
+  RegisterFunction<extensions::TestResetQuotaFunction>();
+  RegisterFunction<extensions::TestCreateIncognitoTabFunction>();
+  RegisterFunction<extensions::TestSendMessageFunction>();
+  RegisterFunction<extensions::TestGetConfigFunction>();
 
   // Record.
   RegisterFunction<extensions::CaptureURLsFunction>();
diff --git a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
index cd0ced6..50ffd16 100644
--- a/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
+++ b/chrome/browser/extensions/extension_input_ime_apitest_chromeos.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/common/chrome_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/extensions/extension_input_method_apitest_chromeos.cc b/chrome/browser/extensions/extension_input_method_apitest_chromeos.cc
index 23e535d..31a07bb 100644
--- a/chrome/browser/extensions/extension_input_method_apitest_chromeos.cc
+++ b/chrome/browser/extensions/extension_input_method_apitest_chromeos.cc
@@ -8,7 +8,7 @@
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
-#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_observer.h"
@@ -52,8 +52,9 @@ class SetInputMethodListener : public content::NotificationObserver {
       chromeos::input_method::InputMethodManager::GetInstance()->
           ChangeInputMethod(StringPrintf("xkb:%s", kNewInputMethod));
 
-      ExtensionTestSendMessageFunction* function =
-          content::Source<ExtensionTestSendMessageFunction>(source).ptr();
+      extensions::TestSendMessageFunction* function =
+          content::Source<extensions::TestSendMessageFunction>(
+              source).ptr();
       EXPECT_GT(count_--, 0);
       function->Reply(kSetInputMethodDone);
     }
diff --git a/chrome/browser/extensions/extension_test_message_listener.cc b/chrome/browser/extensions/extension_test_message_listener.cc
index da2afbf..1405449 100644
--- a/chrome/browser/extensions/extension_test_message_listener.cc
+++ b/chrome/browser/extensions/extension_test_message_listener.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 
 #include "base/string_number_conversions.h"
-#include "chrome/browser/extensions/extension_test_api.h"
+#include "chrome/browser/extensions/api/test/test_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
@@ -49,7 +49,8 @@ void ExtensionTestMessageListener::Observe(
     const content::NotificationDetails& details) {
   const std::string& content = *content::Details<std::string>(details).ptr();
   if (!satisfied_ && content == expected_message_) {
-    function_ = content::Source<ExtensionTestSendMessageFunction>(source).ptr();
+    function_ = content::Source<extensions::TestSendMessageFunction>(
+        source).ptr();
     satisfied_ = true;
     registrar_.RemoveAll();  // Stop listening for more messages.
     if (!will_reply_) {
diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h
index d22ff21..bfb76cc 100644
--- a/chrome/browser/extensions/extension_test_message_listener.h
+++ b/chrome/browser/extensions/extension_test_message_listener.h
@@ -12,7 +12,9 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class ExtensionTestSendMessageFunction;
+namespace extensions {
+class TestSendMessageFunction;
+}
 
 // This class helps us wait for incoming messages sent from javascript via
 // chrome.test.sendMessage(). A sample usage would be:
@@ -87,7 +89,7 @@ class ExtensionTestMessageListener : public content::NotificationObserver {
   bool will_reply_;
 
   // The function we need to reply to.
-  ExtensionTestSendMessageFunction* function_;
+  extensions::TestSendMessageFunction* function_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TEST_MESSAGE_LISTENER_H_
diff --git a/chrome/browser/extensions/extensions_quota_service.h b/chrome/browser/extensions/extensions_quota_service.h
index 6b0ce5d..60acde5 100644
--- a/chrome/browser/extensions/extensions_quota_service.h
+++ b/chrome/browser/extensions/extensions_quota_service.h
@@ -31,6 +31,10 @@ class ExtensionFunction;
 class QuotaLimitHeuristic;
 typedef std::list<QuotaLimitHeuristic*> QuotaLimitHeuristics;
 
+namespace extensions {
+class TestResetQuotaFunction;
+}
+
 // The ExtensionsQuotaService takes care that calls to certain extension
 // functions do not exceed predefined quotas.
 //
@@ -54,7 +58,7 @@ class ExtensionsQuotaService : public base::NonThreadSafe {
   bool Assess(const std::string& extension_id, ExtensionFunction* function,
               const ListValue* args, const base::TimeTicks& event_time);
  private:
-  friend class ExtensionTestQuotaResetFunction;
+  friend class extensions::TestResetQuotaFunction;
   typedef std::string ExtensionId;
   typedef std::string FunctionName;
   // All QuotaLimitHeuristic instances in this map are owned by us.
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 5884f974..a8798c3 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -534,6 +534,8 @@
             'browser/extensions/api/tabs/execute_code_in_tab_function.h',
             'browser/extensions/api/tabs/tabs.cc',
             'browser/extensions/api/tabs/tabs.h',
+            'browser/extensions/api/test/test_api.cc',
+            'browser/extensions/api/test/test_api.h',
             'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc',
             'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h',
             'browser/extensions/api/webstore_private/webstore_private_api.cc',
@@ -562,8 +564,6 @@
             'browser/extensions/extension_page_capture_api.h',
             'browser/extensions/extension_preference_api.cc',
             'browser/extensions/extension_preference_api.h',
-            'browser/extensions/extension_test_api.cc',
-            'browser/extensions/extension_test_api.h',
             'browser/extensions/settings/settings_api.cc',
             'browser/extensions/settings/settings_api.h',
             'browser/extensions/system/system_api.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f4f985e..e994202 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2744,6 +2744,7 @@
         'browser/extensions/api/socket/socket_apitest.cc',
         'browser/extensions/api/tabs/tabs_test.cc',
         'browser/extensions/api/terminal/terminal_private_apitest.cc',
+        'browser/extensions/api/test/apitest_apitest.cc',
         'browser/extensions/api/web_navigation/web_navigation_apitest.cc',
         'browser/extensions/api/web_request/web_request_apitest.cc',
         'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_apitest.cc',
@@ -2765,7 +2766,6 @@
         'browser/extensions/execute_script_apitest.cc',
         'browser/extensions/extension_apitest.cc',
         'browser/extensions/extension_apitest.h',
-        'browser/extensions/extension_apitest_apitest.cc',
         'browser/extensions/extension_bindings_apitest.cc',
         'browser/extensions/extension_browsertest.cc',
         'browser/extensions/extension_browsertest.h',