Moving chrome_auth_private to c/b/extensions/api

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


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

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

chrome/browser/extensions/extension_chrome_auth_private_api.cc → chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_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_chrome_auth_private_api.h"
+#include "chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_api.h"
 
 #include <string>
 #include "base/values.h"
@@ -17,6 +17,8 @@ bool test_mode = false;
 
 }  // namespace
 
+namespace extensions {
+
 SetCloudPrintCredentialsFunction::SetCloudPrintCredentialsFunction() {
 }
 
@@ -47,3 +49,5 @@ bool SetCloudPrintCredentialsFunction::RunImpl() {
 void SetCloudPrintCredentialsFunction::SetTestMode(bool test_mode_enabled) {
   test_mode = test_mode_enabled;
 }
+
+}  // namespace extensions

chrome/browser/extensions/extension_chrome_auth_private_api.h → chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_api.h

@@ -2,12 +2,14 @@
 // 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_CHROME_AUTH_PRIVATE_API_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_CHROME_AUTH_PRIVATE_API_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_CHROME_AUTH_PRIVATE_CHROME_AUTH_PRIVATE_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_CHROME_AUTH_PRIVATE_CHROME_AUTH_PRIVATE_API_H_
 
 #include <string>
 #include "chrome/browser/extensions/extension_function.h"
 
+namespace extensions {
+
 class SetCloudPrintCredentialsFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("chromeAuthPrivate.setCloudPrintCredentials");
@@ -26,5 +28,6 @@ class SetCloudPrintCredentialsFunction : public AsyncExtensionFunction {
   virtual bool RunImpl() OVERRIDE;
 };
 
+}  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CHROME_AUTH_PRIVATE_API_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_CHROME_AUTH_PRIVATE_CHROME_AUTH_PRIVATE_API_H_

chrome/browser/extensions/extension_chrome_auth_private_apitest.cc → chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_apitest.cc

@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/stringprintf.h"
+#include "chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_chrome_auth_private_api.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
@@ -51,10 +51,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionChromeAuthPrivateApiTest,
   // Run this as a hosted app. Since we have overridden the cloud print service
   // URL in the command line, this URL should match the web extent for our
   // cloud print component app and it should work.
-  SetCloudPrintCredentialsFunction::SetTestMode(true);
+  extensions::SetCloudPrintCredentialsFunction::SetTestMode(true);
   GURL page_url = GetTestServerURL(
       "enable_chrome_connector/cloud_print_success_tests.html");
   ASSERT_TRUE(RunPageTest(page_url.spec()));
-  SetCloudPrintCredentialsFunction::SetTestMode(false);
+  extensions::SetCloudPrintCredentialsFunction::SetTestMode(false);
 }
 #endif  // !defined(OS_CHROMEOS)

chrome/browser/extensions/extension_function_registry.cc

@@ -9,6 +9,7 @@
 #include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/extensions/api/app/app_api.h"
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
+#include "chrome/browser/extensions/api/chrome_auth_private/chrome_auth_private_api.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
 #include "chrome/browser/extensions/api/context_menu/context_menu_api.h"
 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
@@ -34,7 +35,6 @@
 #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"
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
-#include "chrome/browser/extensions/extension_chrome_auth_private_api.h"
 #include "chrome/browser/extensions/extension_font_settings_api.h"
 #include "chrome/browser/extensions/extension_i18n_api.h"
 #include "chrome/browser/extensions/extension_idle_api.h"
@@ -443,7 +443,7 @@ void ExtensionFunctionRegistry::ResetFunctions() {
   RegisterFunction<SetMinimumFontSizeFunction>();
 
   // ChromeAuth settings.
-  RegisterFunction<SetCloudPrintCredentialsFunction>();
+  RegisterFunction<extensions::SetCloudPrintCredentialsFunction>();
 
   // Experimental App API.
   RegisterFunction<extensions::AppNotifyFunction>();

chrome/chrome_browser_extensions.gypi

@@ -545,6 +545,8 @@
         }],
         ['enable_extensions==1', {
           'sources': [
+            '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',
             'browser/extensions/api/page_capture/page_capture_api.h',
             'browser/extensions/api/debugger/debugger_api.cc',
@@ -565,8 +567,6 @@
             'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h',
             'browser/extensions/api/webstore_private/webstore_private_api.cc',
             'browser/extensions/api/webstore_private/webstore_private_api.h',
-            'browser/extensions/extension_chrome_auth_private_api.cc',
-            'browser/extensions/extension_chrome_auth_private_api.h',
             'browser/extensions/extension_font_settings_api.cc',
             'browser/extensions/extension_font_settings_api.h',
             'browser/extensions/extension_i18n_api.cc',

chrome/chrome_tests.gypi

@@ -2722,6 +2722,7 @@
         'browser/extensions/api/app/app_apitest.cc',
         'browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc',
         'browser/extensions/api/browsing_data/browsing_data_test.cc',
+        'browser/extensions/api/chrome_auth_private/chrome_auth_private_apitest.cc',
         'browser/extensions/api/cookies/cookies_apitest.cc',
         'browser/extensions/api/context_menu/context_menu_apitest.cc',
         'browser/extensions/api/content_settings/content_settings_apitest.cc',
@@ -2778,7 +2779,6 @@
         'browser/extensions/extension_bindings_apitest.cc',
         'browser/extensions/extension_browsertest.cc',
         'browser/extensions/extension_browsertest.h',
-        'browser/extensions/extension_chrome_auth_private_apitest.cc',
         'browser/extensions/extension_context_menu_browsertest.cc',
         'browser/extensions/extension_crash_recovery_browsertest.cc',
         'browser/extensions/extension_devtools_browsertest.cc',