Componentize SigninErrorController unittest.

No changes are required beyond removing a stale include and componentizing
FakeAuthStatusProvider (which can be componentized as-is).

BUG=334000
TBR=jochen

Review URL: https://codereview.chromium.org/216943002

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

chrome/browser/signin/signin_error_notifier_ash_unittest.cc

@@ -9,7 +9,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_error_notifier_factory_ash.h"
@@ -19,6 +18,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "content/public/test/test_browser_thread_bundle.h"

chrome/browser/signin/signin_global_error_unittest.cc

@@ -6,7 +6,6 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/browser/signin/signin_tracker_unittest.cc

@@ -9,7 +9,6 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
@@ -19,6 +18,7 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"

chrome/browser/sync/sync_ui_util_unittest.cc

@@ -6,12 +6,12 @@
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/sync/sync_ui_util.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

@@ -11,7 +11,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "content/public/browser/notification_service.h"

chrome/browser/ui/webui/sync_setup_handler_unittest.cc

@@ -12,7 +12,6 @@
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/values.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ -26,6 +25,7 @@
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/web_ui.h"

chrome/chrome_tests_unit.gypi

@@ -19,6 +19,8 @@
         '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:password_manager_core_browser_test_support',
+        '../components/components.gyp:signin_core_browser_test_support',
+        '../components/components.gyp:sync_driver_test_support',
         '../components/components.gyp:sync_driver_test_support',
         '../content/content.gyp:content_app_both',
         '../content/content_shell_and_tests.gyp:test_support_content',
@@ -1267,12 +1269,9 @@
         'browser/shell_integration_linux_unittest.cc',
         'browser/shell_integration_win_unittest.cc',
         'browser/signin/account_reconcilor_unittest.cc',
-        'browser/signin/fake_auth_status_provider.cc',
-        'browser/signin/fake_auth_status_provider.h',
         'browser/signin/local_auth_unittest.cc',
         'browser/signin/mutable_profile_oauth2_token_service_unittest.cc',
         'browser/signin/profile_oauth2_token_service_request_unittest.cc',
-        'browser/signin/signin_error_controller_unittest.cc',
         'browser/signin/signin_error_notifier_ash_unittest.cc',
         'browser/signin/signin_global_error_unittest.cc',
         'browser/signin/signin_manager_unittest.cc',

components/components_tests.gyp

@@ -110,6 +110,7 @@
             'rappor/rappor_metric_unittest.cc',
             'rappor/rappor_service_unittest.cc',
             'sessions/serialized_navigation_entry_unittest.cc',
+            'signin/core/browser/signin_error_controller_unittest.cc',
             'signin/core/browser/webdata/token_service_table_unittest.cc',
             'storage_monitor/image_capture_device_manager_unittest.mm',
             'storage_monitor/media_storage_util_unittest.cc',
@@ -211,6 +212,7 @@
 
             # Dependencies of signin
             'components.gyp:signin_core_browser',
+            'components.gyp:signin_core_browser_test_support',
 
             # Dependencies of sync_driver
             'components.gyp:sync_driver_test_support',

components/signin.gypi

@@ -53,15 +53,29 @@
         'signin/core/browser/webdata/token_web_data.cc',
         'signin/core/browser/webdata/token_web_data.h',
       ],
+      'conditions': [
+        ['OS=="android"', {
+          'sources!': [
+            # Not used on Android.
+            'signin/core/browser/mutable_profile_oauth2_token_service.cc',
+            'signin/core/browser/mutable_profile_oauth2_token_service.h',
+          ],
+        }],
+      ],
     },
-  ],
-  'conditions': [
-    ['OS=="android"', {
-      'sources!': [
-        # Not used on Android.
-        'signin/core/browser/mutable_profile_oauth2_token_service.cc',
-        'signin/core/browser/mutable_profile_oauth2_token_service.h',
+    {
+      'target_name': 'signin_core_browser_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'signin_core_browser',
       ],
-    }],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'signin/core/browser/fake_auth_status_provider.cc',
+        'signin/core/browser/fake_auth_status_provider.h',
+      ],
+    },
   ],
 }

chrome/browser/signin/fake_auth_status_provider.cc → components/signin/core/browser/fake_auth_status_provider.cc

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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/signin/fake_auth_status_provider.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 
 FakeAuthStatusProvider::FakeAuthStatusProvider(SigninErrorController* error)
   : error_provider_(error),

chrome/browser/signin/fake_auth_status_provider.h → components/signin/core/browser/fake_auth_status_provider.h

-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_SIGNIN_FAKE_AUTH_STATUS_PROVIDER_H_
-#define CHROME_BROWSER_SIGNIN_FAKE_AUTH_STATUS_PROVIDER_H_
+#ifndef COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_AUTH_STATUS_PROVIDER_H_
+#define COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_AUTH_STATUS_PROVIDER_H_
 
 #include "components/signin/core/browser/signin_error_controller.h"
 
@@ -35,4 +35,4 @@ class FakeAuthStatusProvider
   GoogleServiceAuthError auth_error_;
 };
 
-#endif  // CHROME_BROWSER_SIGNIN_FAKE_AUTH_STATUS_PROVIDER_H_
+#endif  // COMPONENTS_SIGNIN_CORE_BROWSER_FAKE_AUTH_STATUS_PROVIDER_H_

chrome/browser/signin/signin_error_controller_unittest.cc → components/signin/core/browser/signin_error_controller_unittest.cc

@@ -7,8 +7,7 @@
 #include <functional>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/signin/fake_auth_status_provider.h"
-#include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/browser/fake_auth_status_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static const char kTestAccountId[] = "testuser@test.com";