Drop |languages| from {Format,Elide}Url* and IDNToUnicode

components/sync_bookmarks/bookmark_data_type_controller_unittest.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 "components/sync_bookmarks/bookmark_data_type_controller.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 73 matching lines @@
   enum BookmarkLoadPolicy {
     DONT_LOAD_MODEL,
     LOAD_MODEL,
   };
 
   void CreateBookmarkModel(BookmarkLoadPolicy bookmark_load_policy) {
     bookmark_model_.reset(new BookmarkModel(
         make_scoped_ptr(new bookmarks::TestBookmarkClient())));
     if (bookmark_load_policy == LOAD_MODEL) {
       TestingPrefServiceSimple prefs;
-      bookmark_model_->Load(&prefs, std::string(), base::FilePath(),
+      bookmark_model_->Load(&prefs, base::FilePath(),
                             base::ThreadTaskRunnerHandle::Get(),
                             base::ThreadTaskRunnerHandle::Get());
       bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_.get());
     }
   }
 
   void SetStartExpectations() {
     EXPECT_CALL(*history_service_.get(), BackendLoaded())
         .WillRepeatedly(Return(true));
     EXPECT_CALL(model_load_callback_, Run(_, _));
@@ skipping 57 matching lines @@
   SetStartExpectations();
   SetAssociateExpectations();
 
   EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _));
   bookmark_dtc_->LoadModels(
       base::Bind(&ModelLoadCallbackMock::Run,
                  base::Unretained(&model_load_callback_)));
   EXPECT_EQ(DataTypeController::MODEL_STARTING, bookmark_dtc_->state());
 
   TestingPrefServiceSimple prefs;
-  bookmark_model_->Load(&prefs, std::string(), base::FilePath(),
+  bookmark_model_->Load(&prefs, base::FilePath(),
                        base::ThreadTaskRunnerHandle::Get(),
                        base::ThreadTaskRunnerHandle::Get());
   bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_.get());
   EXPECT_EQ(DataTypeController::MODEL_LOADED, bookmark_dtc_->state());
 
   bookmark_dtc_->StartAssociating(
       base::Bind(&StartCallbackMock::Run,
                  base::Unretained(&start_callback_)));
   base::MessageLoop::current()->RunUntilIdle();
 
@@ skipping 113 matching lines @@
   SetStopExpectations();
 
   EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state());
 
   EXPECT_CALL(start_callback_, Run(DataTypeController::OK, _, _));
   Start();
   EXPECT_EQ(DataTypeController::RUNNING, bookmark_dtc_->state());
   bookmark_dtc_->Stop();
   EXPECT_EQ(DataTypeController::NOT_RUNNING, bookmark_dtc_->state());
 }