OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
6 | 6 |
7 #include <deque> | 7 #include <deque> |
8 | 8 |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/json/json_value_converter.h" | 10 #include "base/json/json_value_converter.h" |
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
510 net::NetworkChangeNotifier::SetTestNotificationsOnly(true); | 510 net::NetworkChangeNotifier::SetTestNotificationsOnly(true); |
511 ExtensionApiTest::SetUp(); | 511 ExtensionApiTest::SetUp(); |
512 } | 512 } |
513 | 513 |
514 void FileManagerBrowserTestBase::SetUpOnMainThread() { | 514 void FileManagerBrowserTestBase::SetUpOnMainThread() { |
515 ExtensionApiTest::SetUpOnMainThread(); | 515 ExtensionApiTest::SetUpOnMainThread(); |
516 ASSERT_TRUE(local_volume_->Mount(profile())); | 516 ASSERT_TRUE(local_volume_->Mount(profile())); |
517 | 517 |
518 if (GetGuestModeParam() != IN_GUEST_MODE) { | 518 if (GetGuestModeParam() != IN_GUEST_MODE) { |
519 // Install the web server to serve the mocked share dialog. | 519 // Install the web server to serve the mocked share dialog. |
520 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 520 ASSERT_TRUE(embedded_test_server()->Start()); |
521 const GURL share_url_base(embedded_test_server()->GetURL( | 521 const GURL share_url_base(embedded_test_server()->GetURL( |
522 "/chromeos/file_manager/share_dialog_mock/index.html")); | 522 "/chromeos/file_manager/share_dialog_mock/index.html")); |
523 drive_volume_ = drive_volumes_[profile()->GetOriginalProfile()]; | 523 drive_volume_ = drive_volumes_[profile()->GetOriginalProfile()]; |
524 drive_volume_->ConfigureShareUrlBase(share_url_base); | 524 drive_volume_->ConfigureShareUrlBase(share_url_base); |
525 test_util::WaitUntilDriveMountPointIsAdded(profile()); | 525 test_util::WaitUntilDriveMountPointIsAdded(profile()); |
526 } | 526 } |
527 } | 527 } |
528 | 528 |
529 void FileManagerBrowserTestBase::SetUpCommandLine( | 529 void FileManagerBrowserTestBase::SetUpCommandLine( |
530 base::CommandLine* command_line) { | 530 base::CommandLine* command_line) { |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
723 } | 723 } |
724 | 724 |
725 drive::DriveIntegrationService* | 725 drive::DriveIntegrationService* |
726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { | 726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { |
727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); | 727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); |
728 return drive_volumes_[profile->GetOriginalProfile()] | 728 return drive_volumes_[profile->GetOriginalProfile()] |
729 ->CreateDriveIntegrationService(profile); | 729 ->CreateDriveIntegrationService(profile); |
730 } | 730 } |
731 | 731 |
732 } // namespace file_manager | 732 } // namespace file_manager |
OLD | NEW |