Move many of the Autofill unittests into components_unittests.

components/test/run_all_unittests.cc

 // 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
+
+#if defined(OS_MACOSX)
+#include "base/mac/bundle_locations.h"
+
+// TODO(blundell): Eliminate this dependency by having this file avoid using
+// the //chrome constant to get the framework name on OS X. crbug.com/348563
+#include "chrome/common/chrome_constants.h"
+#endif
 
 #if !defined(OS_IOS)
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
@@ skipping 10 matching lines @@
 #if !defined(OS_IOS)
     gfx::GLSurface::InitializeOneOffForTests(true);
 #endif
 #if defined(OS_ANDROID)
     // Register JNI bindings for android.
     JNIEnv* env = base::android::AttachCurrentThread();
     gfx::android::RegisterJni(env);
     ui::android::RegisterJni(env);
 #endif
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+    // Look in the framework bundle for resources.
+    base::FilePath path;
+    PathService::Get(base::DIR_EXE, &path);

[tfarina, 2014/03/05 18:28:22]

tiny-nit: I'd name this exe_path.

+
+    // TODO(blundell): Eliminate this dependency by having this file avoid using
+    // the //chrome constant to get the framework name on OS X. crbug.com/348563
+    path = path.Append(chrome::kFrameworkName);
+    base::mac::SetOverrideFrameworkBundlePath(path);

[tfarina, 2014/03/05 18:28:22]

nit:

base::mac::SetOverrideFrameworkBundlePath(
  path.AppendASCII(chrome::kFrameworkName));

+#endif
+
+    ui::RegisterPathProvider();

[tfarina, 2014/03/05 18:28:22]

this is to register ui::DIR_LOCALES, ui::DIR_TEST_DATA and
ui::DIR_RESOURCE_PAKS_ANDROID.

Why you call this here?

+
     // TODO(tfarina): This should be changed to InitSharedInstanceWithPakFile()
-    // so we can load our pak file instead of chrome.pak.
+    // so we can load our pak file instead of chrome.pak. crbug.com/348563
     ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+    base::FilePath resources_pack_path;
+    PathService::Get(base::DIR_MODULE, &resources_pack_path);
+    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+        resources_pack_path.AppendASCII("resources.pak"),
+        ui::SCALE_FACTOR_NONE);
   }
 
   virtual void Shutdown() OVERRIDE {
     ui::ResourceBundle::CleanupSharedInstance();
     base::TestSuite::Shutdown();

[tfarina, 2014/03/05 18:28:22]

you also need to add the following here:

#if defined(OS_MACOSX) && !defined(OS_IOS)
  base::mac::SetOverrideFrameworkBundle(NULL);
#endif

   }
 
   DISALLOW_COPY_AND_ASSIGN(ComponentsTestSuite);
 };
 
 class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
  public:
   ComponentsUnitTestEventListener() {}
   virtual ~ComponentsUnitTestEventListener() {}
 
@@ skipping 19 matching lines @@
   // The listener will set up common test environment for all components unit
   // tests.
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new ComponentsUnitTestEventListener());
 
   return base::LaunchUnitTests(
       argc, argv, base::Bind(&base::TestSuite::Run,
                              base::Unretained(&test_suite)));
 }