athena: Introduce ActivityView.

athena/content/app_activity_unittest.cc

 /// Copyright 2014 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 "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
@@ skipping 142 matching lines @@
     return activity;
   }
 
   void DeleteActivity(Activity* activity) {
     Activity::Delete(activity);
     RunAllPendingInMessageLoop();
   }
 
   // Get the position of the activity in the navigation history.
   int GetActivityPosition(Activity* activity) {
-    aura::Window* window = activity->GetActivityViewModel()->GetContentsView()
-                               ->GetWidget()->GetNativeWindow();
+    aura::Window* window = activity->GetWindow();
     aura::Window::Windows windows = activity->GetWindow()->parent()->children();

[oshima, 2014/11/04 22:17:04]

This will fail if there is a non activity window. Can you update to use
WindowListProvider? 

[sadrul, 2014/11/04 23:26:09]

Oops. I meant to move this in a separate patch, since it's unrelated. Removed
from this patchset. (I am working on cleaning up the unfortunate state of this
TestAppActivity: it is a subclass of AppActivity, but overrides pretty much all
of the implementation, and then duplicates some of it to get through the tests).

-    for (size_t i = 0; i < windows.size(); i++) {
-      if (windows[i] == window)
-        return i;
-    }
-    return -1;
+    aura::Window::Windows::iterator iter =
+        std::find(windows.begin(), windows.end(), window);
+    return iter == windows.end() ? -1 : iter - windows.begin();
   }
 
   // To avoid interference of the ResourceManager in these AppActivity
   // framework tests, we disable the ResourceManager for some tests.
   // Every use/interference of this function gets explained.
   void DisableResourceManager() {
     ResourceManager::Get()->Pause(true);
   }
 
  protected:
@@ skipping 241 matching lines @@
   // However - the restart in this test framework does not really restart and
   // all objects should be still there..
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
   Activity::Delete(app_activity_registry->unloaded_activity_proxy());
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena