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

Side by Side Diff: chrome/browser/ui/app_list/arc/arc_app_test.cc

Issue 2106663004: arc: Initial implemetation of Chrome sync for Arc packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. More refactor. Fix unit_test related to refactor. Created 4 years, 5 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/ui/app_list/arc/arc_app_test.h" 5 #include "chrome/browser/ui/app_list/arc/arc_app_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 9 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 10 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 auth_service_->EnableArc(); 114 auth_service_->EnableArc();
115 115
116 arc_app_list_pref_ = ArcAppListPrefs::Get(profile_); 116 arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
117 DCHECK(arc_app_list_pref_); 117 DCHECK(arc_app_list_pref_);
118 118
119 app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_)); 119 app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
120 bridge_service_->app()->SetInstance(app_instance_.get()); 120 bridge_service_->app()->SetInstance(app_instance_.get());
121 121
122 // Check initial conditions. 122 // Check initial conditions.
123 EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get()); 123 EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
124 EXPECT_TRUE(!arc::ArcBridgeService::Get()->available()); 124 EXPECT_FALSE(arc::ArcBridgeService::Get()->available());
125 EXPECT_FALSE(arc::ArcBridgeService::Get()->ready()); 125 EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
126 126
127 // At this point we should have ArcAppListPrefs as observer of service.
128 EXPECT_TRUE(bridge_service_->HasObserver(arc_app_list_pref_));
129 bridge_service()->SetReady(); 127 bridge_service()->SetReady();
130 } 128 }
131 129
132 void ArcAppTest::TearDown() { 130 void ArcAppTest::TearDown() {
133 auth_service_.reset(); 131 auth_service_.reset();
134 } 132 }
135 133
134 void ArcAppTest::ResetAppInstance() {
135 app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
Luis Héctor Chávez 2016/07/20 00:01:15 Can you add a bridge_service_->app()->CloseChannel
lgcheng 2016/07/20 01:23:58 Done.
136 bridge_service_->app()->SetInstance(app_instance_.get());
137 }
138
136 const user_manager::User* ArcAppTest::CreateUserAndLogin() { 139 const user_manager::User* ArcAppTest::CreateUserAndLogin() {
137 const AccountId account_id(AccountId::FromUserEmailGaiaId( 140 const AccountId account_id(AccountId::FromUserEmailGaiaId(
138 profile_->GetProfileUserName(), "1234567890")); 141 profile_->GetProfileUserName(), "1234567890"));
139 const user_manager::User* user = GetUserManager()->AddUser(account_id); 142 const user_manager::User* user = GetUserManager()->AddUser(account_id);
140 GetUserManager()->LoginUser(account_id); 143 GetUserManager()->LoginUser(account_id);
141 return user; 144 return user;
142 } 145 }
143 146
144 void ArcAppTest::AddPackage(const arc::mojom::ArcPackageInfo& package) { 147 void ArcAppTest::AddPackage(const arc::mojom::ArcPackageInfo& package) {
145 if (!FindPackage(package)) 148 if (!FindPackage(package))
(...skipping 10 matching lines...) Expand all
156 } 159 }
157 } 160 }
158 161
159 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) { 162 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) {
160 for (auto fake_package : fake_packages_) { 163 for (auto fake_package : fake_packages_) {
161 if (package.package_name == fake_package.package_name) 164 if (package.package_name == fake_package.package_name)
162 return true; 165 return true;
163 } 166 }
164 return false; 167 return false;
165 } 168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698