Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Side by Side Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

Issue 1306423004: [NetInfo] Browser changes to support connection.downlinkMax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor browser test fix Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/net/browser_online_state_observer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 if (name == "mountFakeMtp") { 678 if (name == "mountFakeMtp") {
679 mtp_volume_.reset(new FakeTestVolume("fake-mtp", VOLUME_TYPE_MTP, 679 mtp_volume_.reset(new FakeTestVolume("fake-mtp", VOLUME_TYPE_MTP,
680 chromeos::DEVICE_TYPE_UNKNOWN)); 680 chromeos::DEVICE_TYPE_UNKNOWN));
681 ASSERT_TRUE(mtp_volume_->PrepareTestEntries(profile())); 681 ASSERT_TRUE(mtp_volume_->PrepareTestEntries(profile()));
682 682
683 mtp_volume_->Mount(profile()); 683 mtp_volume_->Mount(profile());
684 return; 684 return;
685 } 685 }
686 686
687 if (name == "useCellularNetwork") { 687 if (name == "useCellularNetwork") {
688 net::NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests( 688 net::NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChangeForTests(
689 net::NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
690 net::NetworkChangeNotifier::SUBTYPE_HSPA),
689 net::NetworkChangeNotifier::CONNECTION_3G); 691 net::NetworkChangeNotifier::CONNECTION_3G);
690 return; 692 return;
691 } 693 }
692 694
693 if (name == "clickNotificationButton") { 695 if (name == "clickNotificationButton") {
694 std::string extension_id; 696 std::string extension_id;
695 std::string notification_id; 697 std::string notification_id;
696 int index; 698 int index;
697 ASSERT_TRUE(value.GetString("extensionId", &extension_id)); 699 ASSERT_TRUE(value.GetString("extensionId", &extension_id));
698 ASSERT_TRUE(value.GetString("notificationId", &notification_id)); 700 ASSERT_TRUE(value.GetString("notificationId", &notification_id));
(...skipping 22 matching lines...) Expand all
721 } 723 }
722 724
723 drive::DriveIntegrationService* 725 drive::DriveIntegrationService*
724 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { 726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) {
725 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); 727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume());
726 return drive_volumes_[profile->GetOriginalProfile()] 728 return drive_volumes_[profile->GetOriginalProfile()]
727 ->CreateDriveIntegrationService(profile); 729 ->CreateDriveIntegrationService(profile);
728 } 730 }
729 731
730 } // namespace file_manager 732 } // namespace file_manager
OLDNEW
« no previous file with comments | « no previous file | content/browser/net/browser_online_state_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698