Introduce BrowserList and Browser classes for iOS.
Browser will lives between a ChromeBrowserState and a WebStateList
and hold information relative to the state of a tab strip UI while
BrowserList will tie a list of Browsers to a ChromeBrowserState.
Add packed resources to ios_clean_chrome_unittests (for the moment
include all resources used by ios_chrome_unittests until there are
specific resources for //ios/clean) as they are required to create
a ChromeBrowserState.
Add missing ARC header guards to web_state_list_unittest.mm.
BUG=None
Review-Url: https://codereview.chromium.org/2727353006
Cr-Commit-Position: refs/heads/master@{#454944}
diff --git a/ios/clean/chrome/browser/model/BUILD.gn b/ios/clean/chrome/browser/model/BUILD.gn
new file mode 100644
index 0000000..db5f628
--- /dev/null
+++ b/ios/clean/chrome/browser/model/BUILD.gn
@@ -0,0 +1,32 @@
+# Copyright 2017 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.
+
+source_set("model") {
+ sources = [
+ "browser.h",
+ "browser.mm",
+ "browser_list.h",
+ "browser_list.mm",
+ ]
+ deps = [
+ "//base",
+ "//ios/chrome/browser/browser_state",
+ "//ios/shared/chrome/browser/tabs",
+ ]
+ configs += [ "//build/config/compiler:enable_arc" ]
+}
+
+source_set("unit_tests") {
+ testonly = true
+ sources = [
+ "browser_list_unittest.mm",
+ ]
+ deps = [
+ ":model",
+ "//base",
+ "//ios/chrome/browser/browser_state:test_support",
+ "//testing/gtest",
+ ]
+ configs += [ "//build/config/compiler:enable_arc" ]
+}
diff --git a/ios/clean/chrome/browser/model/browser.h b/ios/clean/chrome/browser/model/browser.h
new file mode 100644
index 0000000..0e5349f
--- /dev/null
+++ b/ios/clean/chrome/browser/model/browser.h
@@ -0,0 +1,34 @@
+// Copyright 2017 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.
+
+#ifndef IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_H_
+#define IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_H_
+
+#include "base/macros.h"
+#include "ios/shared/chrome/browser/tabs/web_state_list.h"
+
+namespace ios {
+class ChromeBrowserState;
+}
+
+// Browser holds the state backing a collection of Tabs and the attached
+// UI elements (Tab strip, ...).
+class Browser {
+ public:
+ explicit Browser(ios::ChromeBrowserState* browser_state);
+ ~Browser();
+
+ WebStateList& web_state_list() { return web_state_list_; }
+ const WebStateList& web_state_list() const { return web_state_list_; }
+
+ ios::ChromeBrowserState* browser_state() const { return browser_state_; }
+
+ private:
+ WebStateList web_state_list_;
+ ios::ChromeBrowserState* browser_state_;
+
+ DISALLOW_COPY_AND_ASSIGN(Browser);
+};
+
+#endif // IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_H_
diff --git a/ios/clean/chrome/browser/model/browser.mm b/ios/clean/chrome/browser/model/browser.mm
new file mode 100644
index 0000000..ede26f6a
--- /dev/null
+++ b/ios/clean/chrome/browser/model/browser.mm
@@ -0,0 +1,19 @@
+// Copyright 2017 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.
+
+#import "ios/clean/chrome/browser/model/browser.h"
+
+#include "base/logging.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+Browser::Browser(ios::ChromeBrowserState* browser_state)
+ : web_state_list_(WebStateList::WebStateOwned),
+ browser_state_(browser_state) {
+ DCHECK(browser_state_);
+}
+
+Browser::~Browser() = default;
diff --git a/ios/clean/chrome/browser/model/browser_list.h b/ios/clean/chrome/browser/model/browser_list.h
new file mode 100644
index 0000000..184718c
--- /dev/null
+++ b/ios/clean/chrome/browser/model/browser_list.h
@@ -0,0 +1,48 @@
+// Copyright 2017 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.
+
+#ifndef IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_LIST_H_
+#define IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_LIST_H_
+
+#include <vector>
+
+#include "base/macros.h"
+#include "base/supports_user_data.h"
+#include "ios/clean/chrome/browser/model/browser.h"
+
+namespace ios {
+class ChromeBrowserState;
+}
+
+// BrowserList attaches Browsers instance to a ChromeBrowserState.
+class BrowserList : public base::SupportsUserData::Data {
+ public:
+ explicit BrowserList(ios::ChromeBrowserState* browser_state);
+ ~BrowserList() override;
+
+ static BrowserList* FromBrowserState(ios::ChromeBrowserState* browser_state);
+
+ // Returns the number of open Browsers.
+ int GetBrowserCount() const;
+
+ // Returns whether the specified index is valid.
+ int ContainsIndex(int index) const;
+
+ // Returns the Browser at the specified index.
+ Browser* GetBrowserAtIndex(int index) const;
+
+ // Creates and returns a new Browser instance.
+ Browser* CreateNewBrowser();
+
+ // Closes the Browser at the specified index.
+ void CloseBrowserAtIndex(int index);
+
+ private:
+ std::vector<std::unique_ptr<Browser>> browsers_;
+ ios::ChromeBrowserState* browser_state_;
+
+ DISALLOW_COPY_AND_ASSIGN(BrowserList);
+};
+
+#endif // IOS_CLEAN_CHROME_BROWSER_MODEL_BROWSER_LIST_H_
diff --git a/ios/clean/chrome/browser/model/browser_list.mm b/ios/clean/chrome/browser/model/browser_list.mm
new file mode 100644
index 0000000..5a2e570
--- /dev/null
+++ b/ios/clean/chrome/browser/model/browser_list.mm
@@ -0,0 +1,64 @@
+// Copyright 2017 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.
+
+#import "ios/clean/chrome/browser/model/browser_list.h"
+
+#include <stdint.h>
+
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+namespace {
+const char kBrowserListKey = 0;
+}
+
+BrowserList::BrowserList(ios::ChromeBrowserState* browser_state)
+ : browser_state_(browser_state) {
+ DCHECK(browser_state_);
+}
+
+BrowserList::~BrowserList() = default;
+
+// static
+BrowserList* BrowserList::FromBrowserState(
+ ios::ChromeBrowserState* browser_state) {
+ base::SupportsUserData::Data* data =
+ browser_state->GetUserData(&kBrowserListKey);
+ if (!data) {
+ browser_state->SetUserData(&kBrowserListKey,
+ base::MakeUnique<BrowserList>(browser_state));
+ data = browser_state->GetUserData(&kBrowserListKey);
+ }
+ DCHECK(data);
+ return static_cast<BrowserList*>(data);
+}
+
+int BrowserList::GetBrowserCount() const {
+ DCHECK_LE(browsers_.size(), static_cast<size_t>(INT_MAX));
+ return static_cast<int>(browsers_.size());
+}
+
+int BrowserList::ContainsIndex(int index) const {
+ return 0 <= index && index < GetBrowserCount();
+}
+
+Browser* BrowserList::GetBrowserAtIndex(int index) const {
+ DCHECK(ContainsIndex(index));
+ return browsers_[index].get();
+}
+
+Browser* BrowserList::CreateNewBrowser() {
+ browsers_.push_back(base::MakeUnique<Browser>(browser_state_));
+ return browsers_.back().get();
+}
+
+void BrowserList::CloseBrowserAtIndex(int index) {
+ DCHECK(ContainsIndex(index));
+ browsers_.erase(browsers_.begin() + index);
+}
diff --git a/ios/clean/chrome/browser/model/browser_list_unittest.mm b/ios/clean/chrome/browser/model/browser_list_unittest.mm
new file mode 100644
index 0000000..0348e675
--- /dev/null
+++ b/ios/clean/chrome/browser/model/browser_list_unittest.mm
@@ -0,0 +1,72 @@
+// Copyright 2017 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.
+
+#import "ios/clean/chrome/browser/model/browser_list.h"
+
+#include <memory>
+
+#include "base/macros.h"
+#include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
+class BrowserListTest : public PlatformTest {
+ public:
+ BrowserListTest() {
+ browser_state_ = TestChromeBrowserState::Builder().Build();
+ }
+
+ ios::ChromeBrowserState* browser_state() { return browser_state_.get(); }
+
+ private:
+ std::unique_ptr<ios::ChromeBrowserState> browser_state_;
+
+ DISALLOW_COPY_AND_ASSIGN(BrowserListTest);
+};
+
+TEST_F(BrowserListTest, Initialisation) {
+ EXPECT_TRUE(BrowserList::FromBrowserState(browser_state()));
+}
+
+TEST_F(BrowserListTest, CreateBrowser) {
+ BrowserList* browser_list = BrowserList::FromBrowserState(browser_state());
+ EXPECT_EQ(0, browser_list->GetBrowserCount());
+
+ Browser* browser = browser_list->CreateNewBrowser();
+ ASSERT_EQ(1, browser_list->GetBrowserCount());
+ EXPECT_EQ(browser, browser_list->GetBrowserAtIndex(0));
+}
+
+TEST_F(BrowserListTest, CloseBrowser) {
+ BrowserList* browser_list = BrowserList::FromBrowserState(browser_state());
+ browser_list->CreateNewBrowser();
+ EXPECT_EQ(1, browser_list->GetBrowserCount());
+
+ browser_list->CloseBrowserAtIndex(0);
+ EXPECT_EQ(0, browser_list->GetBrowserCount());
+}
+
+TEST_F(BrowserListTest, ContainsIndex) {
+ BrowserList* browser_list = BrowserList::FromBrowserState(browser_state());
+ EXPECT_EQ(0, browser_list->GetBrowserCount());
+ EXPECT_FALSE(browser_list->ContainsIndex(-1));
+ EXPECT_FALSE(browser_list->ContainsIndex(0));
+ EXPECT_FALSE(browser_list->ContainsIndex(1));
+
+ browser_list->CreateNewBrowser();
+ EXPECT_EQ(1, browser_list->GetBrowserCount());
+ EXPECT_FALSE(browser_list->ContainsIndex(-1));
+ EXPECT_TRUE(browser_list->ContainsIndex(0));
+ EXPECT_FALSE(browser_list->ContainsIndex(1));
+
+ browser_list->CreateNewBrowser();
+ EXPECT_EQ(2, browser_list->GetBrowserCount());
+ EXPECT_FALSE(browser_list->ContainsIndex(-1));
+ EXPECT_TRUE(browser_list->ContainsIndex(0));
+ EXPECT_TRUE(browser_list->ContainsIndex(1));
+}
diff --git a/ios/clean/chrome/test/BUILD.gn b/ios/clean/chrome/test/BUILD.gn
index 4ea23cac..758c428 100644
--- a/ios/clean/chrome/test/BUILD.gn
+++ b/ios/clean/chrome/test/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//ios/public/provider/chrome/browser/build_config.gni")
import("//testing/test.gni")
group("all_tests") {
@@ -13,8 +14,13 @@
test("ios_clean_chrome_unittests") {
deps = [
+ # Ensure that all unit tests are run, use fake hooks and pack resources.
"//ios/chrome/test:run_all_unittests",
+ ios_packed_resources_target,
+
+ # Add unit_tests target here.
"//ios/clean/chrome/browser:unit_tests",
+ "//ios/clean/chrome/browser/model:unit_tests",
"//ios/clean/chrome/browser/ui/web_contents:unit_tests",
]
}
diff --git a/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm b/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
index b1e567d8..5467429 100644
--- a/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
+++ b/ios/shared/chrome/browser/tabs/web_state_list_unittest.mm
@@ -13,6 +13,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
const char kURL0[] = "https://chromium.org/0";
const char kURL1[] = "https://chromium.org/1";
