Revert of ui: Add a helper function to get the path to ui_test.pak. (https://codereview.chromium.org/272373002/)

Reason for revert:
This seems to have broken http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%283%29, since build http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%283%29/builds/23883.
Relevant stack trace (below) hints at path provider collision, added here in run_all_unittests.cc files:

@@@STEP_LOG_LINE@CheckStackedPanelProperties@StackedPanelBrowserTest.CheckStackedPanelProperties (run #1):@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@[ RUN      ] StackedPanelBrowserTest.CheckStackedPanelProperties@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@[6585:65795:0514/010715:257094429265:FATAL:path_service.cc(323)] Check failed: key_start >= iter->key_end || key_end \u003C= iter->key_start. path provider collision@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@0   libbase.dylib                       0x0e3be10f base::debug::StackTrace::StackTrace() + 63@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@1   libbase.dylib                       0x0e3be16b base::debug::StackTrace::StackTrace() + 43@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@2   libbase.dylib                       0x0e465c92 logging::LogMessage::~LogMessage() + 82@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@3   libbase.dylib                       0x0e46470b logging::LogMessage::~LogMessage() + 43@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@4   libbase.dylib                       0x0e4ebed0 PathService::RegisterProvider(bool (*)(int, base::FilePath*), int, int) + 848@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@5   libui_base.dylib                    0x111dceea ui::RegisterPathProvider() + 74@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@6   libcontent.dylib                    0x1a4cf1d5 content::ContentMainRunnerImpl::Initialize(content::ContentMainParams const&) + 1781@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@7   libcontent.dylib                    0x1a4cd580 content::ContentMain(content::ContentMainParams const&) + 80@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@8   interactive_ui_tests                0x04a43eae content::BrowserTestBase::SetUp() + 1406@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@9   interactive_ui_tests                0x01b89b02 InProcessBrowserTest::SetUp() + 1394@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@10  interactive_ui_tests                0x0035a4b1 void testing::internal::HandleSehExceptionsInMethodIfSupported\u003Ctesting::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) + 145@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@11  interactive_ui_tests                0x0034c47e void testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::Test, void>(testing::Test*, void (testing::Test::*)(), char const*) + 126@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@12  interactive_ui_tests                0x0033f6c8 testing::Test::Run() + 152@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@13  interactive_ui_tests                0x003401d7 testing::TestInfo::Run() + 263@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@14  interactive_ui_tests                0x00340a99 testing::TestCase::Run() + 265@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@15  interactive_ui_tests                0x00346545 testing::internal::UnitTestImpl::RunAllTests() + 821@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@16  interactive_ui_tests                0x00356631 bool testing::internal::HandleSehExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) + 145@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@17  interactive_ui_tests                0x0034ecce bool testing::internal::HandleExceptionsInMethodIfSupported\u003Ctesting::internal::UnitTestImpl, bool>(testing::internal::UnitTestImpl*, bool (testing::internal::UnitTestImpl::*)(), char const*) + 126@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@18  interactive_ui_tests                0x003461d4 testing::UnitTest::Run() + 148@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@19  interactive_ui_tests                0x01bd7077 RUN_ALL_TESTS() + 39@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@20  interactive_ui_tests                0x01bd5850 base::TestSuite::Run() + 240@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@21  interactive_ui_tests                0x002e5783 InteractiveUITestSuiteRunner::RunTestSuite(int, char**) + 83@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@22  interactive_ui_tests                0x01b8699b (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite(int, char**) + 75@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@23  interactive_ui_tests                0x04a60f3e content::LaunchTests(content::TestLauncherDelegate*, int, int, char**) + 1598@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@24  interactive_ui_tests                0x01b8679c LaunchChromeTests(int, ChromeTestSuiteRunner*, int, char**) + 108@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@25  interactive_ui_tests                0x002e55f1 main + 97@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@26  interactive_ui_tests                0x0002ea35 start + 53@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@@@@
@@@STEP_LOG_LINE@CheckStackedPanelProperties@@@@
@@@STEP_LOG_END@CheckStackedPanelProperties@@@

Original issue's description:
> ui: Add a new key to ui_base_paths.h to easily get the path to ui_test.pak.
> 
> That way the clients will have less code to copy-and-paste when initalizing
> ResourceBundle in the TestSuites.
> 
> BUG=None
> TEST=app_list_unittests,
>      keyboard_unittests,
>      message_center_unittests
>      views_unittests
>      views_examples_exe
>      wm_unittests
> R=tony@chromium.org,ben@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270353

TBR=ben@chromium.org,tony@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None

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

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

12 files changed, 71 insertions, 49 deletions

diff --git a/ui/app_list/test/run_all_unittests.cc b/ui/app_list/test/run_all_unittests.cc
index fa3c94b..48dd5a8 100644
--- a/ui/app_list/test/run_all_unittests.cc
+++ b/ui/app_list/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
@@ -30,9 +29,13 @@ class AppListTestSuite : public base::TestSuite {
     base::TestSuite::Initialize();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {
diff --git a/ui/base/ui_base_paths.cc b/ui/base/ui_base_paths.cc
index 85723b5..ee7566e 100644
--- a/ui/base/ui_base_paths.cc
+++ b/ui/base/ui_base_paths.cc
@@ -58,11 +58,6 @@ bool PathProvider(int key, base::FilePath* result) {
       cur = cur.Append(FILE_PATH_LITERAL("paks"));
       break;
 #endif
-    case UI_TEST_PAK:
-      if (!PathService::Get(base::DIR_MODULE, &cur))
-        return false;
-      cur = cur.AppendASCII("ui_test.pak");
-      break;
     default:
       return false;
   }
diff --git a/ui/base/ui_base_paths.h b/ui/base/ui_base_paths.h
index 2a3e062..cd2c230 100644
--- a/ui/base/ui_base_paths.h
+++ b/ui/base/ui_base_paths.h
@@ -8,8 +8,8 @@
 #include "build/build_config.h"
 #include "ui/base/ui_base_export.h"
 
-// This file declares path keys for various special directories. These can be
-// used with the PathService to access these directories and files.
+// This file declares path keys for the app module.  These can be used with
+// the PathService to access various special directories and files.
 
 namespace ui {
 
@@ -25,8 +25,6 @@ enum {
   DIR_RESOURCE_PAKS_ANDROID,
 #endif
 
-  UI_TEST_PAK,
-
   PATH_END
 };
 
diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/keyboard/test/run_all_unittests.cc
index 9ecd0c6..d5e5bc0 100644
--- a/ui/keyboard/test/run_all_unittests.cc
+++ b/ui/keyboard/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/gl_surface.h"
@@ -25,9 +24,13 @@ class KeyboardTestSuite : public base::TestSuite {
     gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {
diff --git a/ui/message_center/test/run_all_unittests.cc b/ui/message_center/test/run_all_unittests.cc
index f657e04..1688dd7 100644
--- a/ui/message_center/test/run_all_unittests.cc
+++ b/ui/message_center/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
@@ -30,9 +29,13 @@ class MessageCenterTestSuite : public base::TestSuite {
     base::TestSuite::Initialize();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {
diff --git a/ui/views/corewm/desktop_capture_controller_unittest.cc b/ui/views/corewm/desktop_capture_controller_unittest.cc
index 03280da..8807aafd 100644
--- a/ui/views/corewm/desktop_capture_controller_unittest.cc
+++ b/ui/views/corewm/desktop_capture_controller_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ -35,10 +34,11 @@ class DesktopCaptureControllerTest : public ViewsTestBase {
 
   virtual void SetUp() OVERRIDE {
     gfx::GLSurface::InitializeOneOffForTests();
-
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 
     ViewsTestBase::SetUp();
   }
diff --git a/ui/views/examples/content_client/examples_main_delegate.cc b/ui/views/examples/content_client/examples_main_delegate.cc
index 5680ea3..aabd289 100644
--- a/ui/views/examples/content_client/examples_main_delegate.cc
+++ b/ui/views/examples/content_client/examples_main_delegate.cc
@@ -57,9 +57,7 @@ bool ExamplesMainDelegate::BasicStartupComplete(int* exit_code) {
 }
 
 void ExamplesMainDelegate::PreSandboxStartup() {
-  base::FilePath ui_test_pak_path;
-  DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+  InitializeResourceBundle();
 }
 
 content::ContentBrowserClient*
@@ -68,5 +66,15 @@ content::ContentBrowserClient*
   return browser_client_.get();
 }
 
+void ExamplesMainDelegate::InitializeResourceBundle() {
+  base::FilePath pak_dir;
+  PathService::Get(base::DIR_MODULE, &pak_dir);
+
+  base::FilePath pak_file;
+  pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+}
+
 }  // namespace examples
 }  // namespace views
diff --git a/ui/views/examples/content_client/examples_main_delegate.h b/ui/views/examples/content_client/examples_main_delegate.h
index 1bfd5c3..c52fd81 100644
--- a/ui/views/examples/content_client/examples_main_delegate.h
+++ b/ui/views/examples/content_client/examples_main_delegate.h
@@ -28,6 +28,8 @@ class ExamplesMainDelegate : public content::ContentMainDelegate {
   virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
 
  private:
+  void InitializeResourceBundle();
+
   scoped_ptr<ExamplesContentBrowserClient> browser_client_;
   content::ShellContentClient content_client_;
 
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 848a8e5..d1be4b6 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -12,7 +12,6 @@
 #include "ui/aura/env.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/base/ui_base_paths.h"
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/gfx/screen.h"
 #include "ui/gl/gl_surface.h"
@@ -59,11 +58,13 @@ int main(int argc, char** argv) {
 
   base::i18n::InitializeICU();
 
-  ui::RegisterPathProvider();
+  base::FilePath pak_dir;
+  PathService::Get(base::DIR_MODULE, &pak_dir);
 
-  base::FilePath ui_test_pak_path;
-  DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-  ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+  base::FilePath pak_file;
+  pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 
   aura::Env::CreateInstance(true);
 
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc
index e5d7b9d..63b1fd5 100644
--- a/ui/views/run_all_unittests.cc
+++ b/ui/views/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/gl_surface.h"
@@ -23,9 +22,13 @@ class ViewTestSuite : public base::TestSuite {
     gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 693df43..ae547ad 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -7,7 +7,6 @@
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
@@ -156,9 +155,11 @@ class WidgetTestInteractive : public WidgetTest {
 
   virtual void SetUp() OVERRIDE {
     gfx::GLSurface::InitializeOneOffForTests();
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
     WidgetTest::SetUp();
   }
 };
@@ -739,9 +740,11 @@ class WidgetCaptureTest : public ViewsTestBase {
 
   virtual void SetUp() OVERRIDE {
     gfx::GLSurface::InitializeOneOffForTests();
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
     ViewsTestBase::SetUp();
   }
 
diff --git a/ui/wm/test/run_all_unittests.cc b/ui/wm/test/run_all_unittests.cc
index 6e04469..d399ca1 100644
--- a/ui/wm/test/run_all_unittests.cc
+++ b/ui/wm/test/run_all_unittests.cc
@@ -8,7 +8,6 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/gl_surface.h"
@@ -23,9 +22,13 @@ class WMTestSuite : public base::TestSuite {
     gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {