Add module suffix in .mojom files for components/arc

chrome/browser/ui/app_list/arc/arc_app_unittest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
@@ skipping 121 matching lines @@
     const size_t count = GetArcItemCount();
     for (size_t i = 0; i < count; ++i) {
       ArcAppItem* item = GetArcItem(i);
       if (item && item->id() == id)
         return item;
     }
     return nullptr;
   }
 
   // Validate that prefs and model have right content.
-  void ValidateHaveApps(const std::vector<arc::AppInfo> apps) {
+  void ValidateHaveApps(const std::vector<arc::mojom::AppInfo> apps) {
     ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
     const std::vector<std::string> ids = prefs->GetAppIds();
     ASSERT_EQ(apps.size(), ids.size());
     ASSERT_EQ(apps.size(), GetArcItemCount());
     // In principle, order of items is not defined.
     for (auto& app : apps) {
       const std::string id = ArcAppTest::GetAppId(app);
       EXPECT_NE(std::find(ids.begin(), ids.end(), id), ids.end());
       std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(id);
       ASSERT_NE(nullptr, app_info.get());
       EXPECT_EQ(app.name, app_info->name);
       EXPECT_EQ(app.package_name, app_info->package_name);
       EXPECT_EQ(app.activity, app_info->activity);
 
       const ArcAppItem* app_item = FindArcItem(id);
       ASSERT_NE(nullptr, app_item);
       EXPECT_EQ(app.name, app_item->GetDisplayName());
     }
   }
 
   // Validate that requested apps have required ready state and other apps have
   // opposite state.
-  void ValidateAppReadyState(const std::vector<arc::AppInfo> apps, bool ready) {
+  void ValidateAppReadyState(const std::vector<arc::mojom::AppInfo> apps,
+                             bool ready) {
     ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
     ASSERT_NE(nullptr, prefs);
 
     std::vector<std::string> ids = prefs->GetAppIds();
     EXPECT_EQ(ids.size(), GetArcItemCount());
 
     // Process requested apps.
     for (auto& app : apps) {
       const std::string id = ArcAppTest::GetAppId(app);
       std::vector<std::string>::iterator it_id = std::find(ids.begin(),
@@ skipping 37 matching lines @@
           representation.pixel_width());
       EXPECT_EQ(gfx::ToCeiledInt(app_list::kGridIconDimension * scale),
           representation.pixel_height());
     }
   }
 
   AppListControllerDelegate* controller() { return controller_.get(); }
 
   Profile* profile() { return profile_.get(); }
 
-  const std::vector<arc::AppInfo>& fake_apps() const {
+  const std::vector<arc::mojom::AppInfo>& fake_apps() const {
     return arc_test_.fake_apps();
   }
 
   arc::FakeArcBridgeService* bridge_service() {
     return arc_test_.bridge_service();
   }
 
   arc::FakeAppInstance* app_instance() {
     return arc_test_.app_instance();
   }
@@ skipping 10 matching lines @@
 TEST_F(ArcAppModelBuilderTest, RefreshAllOnReady) {
   // There should already have been one call, when the interface was
   // registered.
   EXPECT_EQ(1, app_instance()->refresh_app_list_count());
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
   EXPECT_EQ(2, app_instance()->refresh_app_list_count());
 }
 
 TEST_F(ArcAppModelBuilderTest, RefreshAllFillsContent) {
-  ValidateHaveApps(std::vector<arc::AppInfo>());
+  ValidateHaveApps(std::vector<arc::mojom::AppInfo>());
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
   app_instance()->SendRefreshAppList(fake_apps());
   ValidateHaveApps(fake_apps());
 }
 
 TEST_F(ArcAppModelBuilderTest, MultipleRefreshAll) {
-  ValidateHaveApps(std::vector<arc::AppInfo>());
+  ValidateHaveApps(std::vector<arc::mojom::AppInfo>());
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
   // Send info about all fake apps except last.
-  std::vector<arc::AppInfo> apps1(fake_apps().begin(), fake_apps().end() - 1);
+  std::vector<arc::mojom::AppInfo> apps1(fake_apps().begin(),
+                                         fake_apps().end() - 1);
   app_instance()->SendRefreshAppList(apps1);
   // At this point all apps (except last) should exist and be ready.
   ValidateHaveApps(apps1);
   ValidateAppReadyState(apps1, true);
 
   // Send info about all fake apps except first.
-  std::vector<arc::AppInfo> apps2(fake_apps().begin() + 1, fake_apps().end());
+  std::vector<arc::mojom::AppInfo> apps2(fake_apps().begin() + 1,
+                                         fake_apps().end());
   app_instance()->SendRefreshAppList(apps2);
   // At this point all apps should exist but first one should be non-ready.
   ValidateHaveApps(apps2);
   ValidateAppReadyState(apps2, true);
 
   // Send info about all fake apps.
   app_instance()->SendRefreshAppList(fake_apps());
   // At this point all apps should exist and be ready.
   ValidateHaveApps(fake_apps());
   ValidateAppReadyState(fake_apps(), true);
 
   // Send info no app available.
-  std::vector<arc::AppInfo> no_apps;
+  std::vector<arc::mojom::AppInfo> no_apps;
   app_instance()->SendRefreshAppList(no_apps);
   // At this point no app should exist.
   ValidateHaveApps(no_apps);
 }
 
 TEST_F(ArcAppModelBuilderTest, StopStartServicePreserveApps) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   bridge_service()->SetReady();
@@ skipping 44 matching lines @@
 
 TEST_F(ArcAppModelBuilderTest, LaunchApps) {
   // Disable attempts to dismiss app launcher view.
   ChromeAppListItem::OverrideAppListControllerDelegateForTesting(controller());
 
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
   app_instance()->SendRefreshAppList(fake_apps());
 
   // Simulate item activate.
-  const arc::AppInfo& app_first = fake_apps()[0];
-  const arc::AppInfo& app_last = fake_apps()[0];
+  const arc::mojom::AppInfo& app_first = fake_apps()[0];
+  const arc::mojom::AppInfo& app_last = fake_apps()[0];
   ArcAppItem* item_first = FindArcItem(ArcAppTest::GetAppId(app_first));
   ArcAppItem* item_last = FindArcItem(ArcAppTest::GetAppId(app_last));
   ASSERT_NE(nullptr, item_first);
   ASSERT_NE(nullptr, item_last);
   item_first->Activate(0);
   app_instance()->WaitForIncomingMethodCall();
   item_last->Activate(0);
   app_instance()->WaitForIncomingMethodCall();
   item_first->Activate(0);
   app_instance()->WaitForIncomingMethodCall();
@@ skipping 75 matching lines @@
     EXPECT_EQ(app_masks[id], expected_mask);
   }
 }
 
 TEST_F(ArcAppModelBuilderTest, InstallIcon) {
   // Make sure we are on UI thread.
   ASSERT_TRUE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
-  app_instance()->SendRefreshAppList(
-      std::vector<arc::AppInfo>(fake_apps().begin(), fake_apps().begin() + 1));
-  const arc::AppInfo& app = fake_apps()[0];
+  app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>(
+      fake_apps().begin(), fake_apps().begin() + 1));
+  const arc::mojom::AppInfo& app = fake_apps()[0];
 
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   const ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactors()[0];
   const float scale = ui::GetScaleForScaleFactor(scale_factor);
   const base::FilePath icon_path = prefs->GetIconPath(ArcAppTest::GetAppId(app),
                                                       scale_factor);
   EXPECT_EQ(true, !base::PathExists(icon_path));
 
   const ArcAppItem* app_item = FindArcItem(ArcAppTest::GetAppId(app));
   EXPECT_NE(nullptr, app_item);
   // This initiates async loading.
   app_item->icon().GetRepresentation(scale);
 
   // Process pending tasks.
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   // Validating decoded content does not fit well for unit tests.
   ArcAppIcon::DisableSafeDecodingForTesting();
 
   // Now send generated icon for the app.
   std::string png_data;
-  EXPECT_EQ(true,
-            app_instance()->GenerateAndSendIcon(
-                app, static_cast<arc::ScaleFactor>(scale_factor), &png_data));
+  EXPECT_EQ(true, app_instance()->GenerateAndSendIcon(
+                      app, static_cast<arc::mojom::ScaleFactor>(scale_factor),
+                      &png_data));
 
   // Process pending tasks.
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   // Validate that icons are installed, have right content and icon is
   // refreshed for ARC app item.
   EXPECT_EQ(true, base::PathExists(icon_path));
 
   std::string icon_data;
   // Read the file from disk and compare with reference data.
   EXPECT_EQ(true, base::ReadFileToString(icon_path, &icon_data));
   ASSERT_EQ(icon_data, png_data);
 }
 
 TEST_F(ArcAppModelBuilderTest, RemoveAppCleanUpFolder) {
   // Make sure we are on UI thread.
   ASSERT_TRUE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
-  app_instance()->SendRefreshAppList(
-      std::vector<arc::AppInfo>(fake_apps().begin(), fake_apps().begin() + 1));
-  const arc::AppInfo& app = fake_apps()[0];
+  app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>(
+      fake_apps().begin(), fake_apps().begin() + 1));
+  const arc::mojom::AppInfo& app = fake_apps()[0];
 
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   const std::string app_id = ArcAppTest::GetAppId(app);
   const base::FilePath app_path = prefs->GetAppPath(app_id);
   const ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactors()[0];
 
   // No app folder by default.
   EXPECT_EQ(true, !base::PathExists(app_path));
 
   // Request icon, this will create app folder.
   prefs->RequestIcon(app_id, scale_factor);
   // Now send generated icon for the app.
   std::string png_data;
-  EXPECT_EQ(true,
-            app_instance()->GenerateAndSendIcon(
-                app, static_cast<arc::ScaleFactor>(scale_factor), &png_data));
+  EXPECT_EQ(true, app_instance()->GenerateAndSendIcon(
+                      app, static_cast<arc::mojom::ScaleFactor>(scale_factor),
+                      &png_data));
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, base::PathExists(app_path));
 
   // Send empty app list. This will delete app and its folder.
-  app_instance()->SendRefreshAppList(std::vector<arc::AppInfo>());
+  app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>());
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(true, !base::PathExists(app_path));
 }
 
 TEST_F(ArcAppModelBuilderTest, LastLaunchTime) {
   // Make sure we are on UI thread.
   ASSERT_TRUE(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
-  app_instance()->SendRefreshAppList(
-      std::vector<arc::AppInfo>(fake_apps().begin(), fake_apps().begin() + 2));
-  const arc::AppInfo& app1 = fake_apps()[0];
-  const arc::AppInfo& app2 = fake_apps()[1];
+  app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>(
+      fake_apps().begin(), fake_apps().begin() + 2));
+  const arc::mojom::AppInfo& app1 = fake_apps()[0];
+  const arc::mojom::AppInfo& app2 = fake_apps()[1];
   const std::string id1 = ArcAppTest::GetAppId(app1);
   const std::string id2 = ArcAppTest::GetAppId(app2);
 
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info = prefs->GetApp(id1);
   ASSERT_NE(nullptr, app_info.get());
 
   EXPECT_EQ(base::Time(), app_info->last_launch_time);
@@ skipping 18 matching lines @@
   app_info = prefs->GetApp(id2);
   ASSERT_NE(nullptr, app_info.get());
   ASSERT_LE(time_before, app_info->last_launch_time);
   ASSERT_GE(time_after, app_info->last_launch_time);
 }
 
 TEST_F(ArcAppModelBuilderTest, IconLoader) {
   // Validating decoded content does not fit well for unit tests.
   ArcAppIcon::DisableSafeDecodingForTesting();
 
-  const arc::AppInfo& app = fake_apps()[0];
+  const arc::mojom::AppInfo& app = fake_apps()[0];
   const std::string app_id = ArcAppTest::GetAppId(app);
 
   bridge_service()->SetReady();
   app_instance()->RefreshAppList();
-  app_instance()->SendRefreshAppList(
-      std::vector<arc::AppInfo>(fake_apps().begin(), fake_apps().begin() + 1));
+  app_instance()->SendRefreshAppList(std::vector<arc::mojom::AppInfo>(
+      fake_apps().begin(), fake_apps().begin() + 1));
 
   FakeAppIconLoaderDelegate delegate;
   ArcAppIconLoader icon_loader(profile(), app_list::kListIconSize, &delegate);
   EXPECT_EQ(0UL, delegate.update_image_cnt());
   icon_loader.FetchImage(app_id);
   EXPECT_EQ(1UL, delegate.update_image_cnt());
   EXPECT_EQ(app_id, delegate.app_id());
 
   // Validate default image.
   ValidateIcon(delegate.image());
 
   const std::vector<ui::ScaleFactor>& scale_factors =
       ui::GetSupportedScaleFactors();
   for (auto& scale_factor : scale_factors) {
     std::string png_data;
     EXPECT_TRUE(app_instance()->GenerateAndSendIcon(
-                    app, static_cast<arc::ScaleFactor>(scale_factor),
-                    &png_data));
+        app, static_cast<arc::mojom::ScaleFactor>(scale_factor), &png_data));
   }
 
   // Process pending tasks, this installs icons.
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   // Allow one more circle to read and decode installed icons.
   content::BrowserThread::GetBlockingPool()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   // Validate loaded image.
   EXPECT_EQ(1 + scale_factors.size(), delegate.update_image_cnt());
   EXPECT_EQ(app_id, delegate.app_id());
   ValidateIcon(delegate.image());
 }