Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale().

ash/drag_drop/drag_drop_interactive_uitest.cc

 // Copyright (c) 2013 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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 112 matching lines @@
 
 class DragDropTest : public test::AshTestBase {
  public:
   DragDropTest() {}
   virtual ~DragDropTest() {}
 
   virtual void SetUp() OVERRIDE {
     gfx::GLSurface::InitializeOneOffForTests();
 
     ui::RegisterPathProvider();
-    ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+    ui::ResourceBundle::InitSharedInstanceWithLocale(
+        "en-US", NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
     base::FilePath resources_pack_path;
     PathService::Get(base::DIR_MODULE, &resources_pack_path);
     resources_pack_path =
         resources_pack_path.Append(FILE_PATH_LITERAL("resources.pak"));
     ResourceBundle::GetSharedInstance().AddDataPackFromPath(
         resources_pack_path, ui::SCALE_FACTOR_NONE);
 
     test::AshTestBase::SetUp();
   }
 };
@@ skipping 33 matching lines @@
 
   base::MessageLoop::current()->Run();
 
   EXPECT_TRUE(target_view->dropped());
 
   source->Close();
   target->Close();
 }
 
 }  // namespace ash