Split IsArcPlayStoreEnabled() and ArcSessionManager's enabled concepts.

chrome/browser/chromeos/note_taking_helper_unittest.cc

 // Copyright 2016 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 "chrome/browser/chromeos/note_taking_helper.h"
 
 #include <utility>
 
 #include "ash/common/ash_switches.h"
 #include "base/bind.h"
@@ skipping 626 matching lines @@
   // Let the app-fetching callback run and check that the observer is notified.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1, observer.num_updates());
 
   // Disabling and enabling ARC should also notify the observer (and enabling
   // should request apps again).
   profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, false);
   EXPECT_EQ(2, observer.num_updates());
   profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
   EXPECT_EQ(3, observer.num_updates());
+  // Run ARC data removing operation.
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(4, observer.num_updates());

[hidehiko, 2017/02/15 14:17:00]

Note: I removed OnArcPlayStoreEnabledChanged() invocation from re-enable case,
because it should be already called immediately (in this test case, it is
counted at L646).

 
   // Update intent filters and check that the observer is notified again after
   // apps are received.
   helper()->OnIntentFiltersUpdated();
+  EXPECT_EQ(3, observer.num_updates());
+  base::RunLoop().RunUntilIdle();
   EXPECT_EQ(4, observer.num_updates());
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(5, observer.num_updates());
 }
 
 TEST_F(NoteTakingHelperTest, NotifyObserverAboutChromeApps) {
   Init(ENABLE_PALETTE);
   TestObserver observer;
   ASSERT_EQ(0, observer.num_updates());
 
   // Notify that the prod Keep app was installed for the initial profile. Chrome
   // extensions are queried dynamically when GetAvailableApps() is called, so we
   // don't need to actually install it.
@@ skipping 22 matching lines @@
   InitExtensionService(second_profile);
   EXPECT_EQ(0, observer.num_updates());
   InstallExtension(keep_extension.get(), second_profile);
   EXPECT_EQ(1, observer.num_updates());
   UninstallExtension(keep_extension.get(), second_profile);
   EXPECT_EQ(2, observer.num_updates());
   profile_manager_->DeleteTestingProfile(kSecondProfileName);
 }
 
 }  // namespace chromeos