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

Side by Side Diff: chrome/browser/extensions/api/tabs/tabs_api_unittest.cc

Issue 1662783002: Remove HostDesktopType from Browser::CreateParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-12
Patch Set: remove desktop_type_ in bookmark_bubble_sign_in_delegate Created 4 years, 10 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 "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "chrome/browser/extensions/api/tabs/tabs_api.h" 6 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
7 #include "chrome/browser/extensions/extension_function_test_utils.h" 7 #include "chrome/browser/extensions/extension_function_test_utils.h"
8 #include "chrome/browser/extensions/extension_service_test_base.h" 8 #include "chrome/browser/extensions/extension_service_test_base.h"
9 #include "chrome/browser/extensions/extension_tab_util.h" 9 #include "chrome/browser/extensions/extension_tab_util.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 scoped_ptr<Browser> browser_; 53 scoped_ptr<Browser> browser_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(TabsApiUnitTest); 55 DISALLOW_COPY_AND_ASSIGN(TabsApiUnitTest);
56 }; 56 };
57 57
58 void TabsApiUnitTest::SetUp() { 58 void TabsApiUnitTest::SetUp() {
59 ExtensionServiceTestBase::SetUp(); 59 ExtensionServiceTestBase::SetUp();
60 InitializeEmptyExtensionService(); 60 InitializeEmptyExtensionService();
61 61
62 browser_window_.reset(new TestBrowserWindow()); 62 browser_window_.reset(new TestBrowserWindow());
63 Browser::CreateParams params(profile(), chrome::HOST_DESKTOP_TYPE_NATIVE); 63 Browser::CreateParams params(profile());
64 params.type = Browser::TYPE_TABBED; 64 params.type = Browser::TYPE_TABBED;
65 params.window = browser_window_.get(); 65 params.window = browser_window_.get();
66 browser_.reset(new Browser(params)); 66 browser_.reset(new Browser(params));
67 } 67 }
68 68
69 void TabsApiUnitTest::TearDown() { 69 void TabsApiUnitTest::TearDown() {
70 browser_.reset(); 70 browser_.reset();
71 browser_window_.reset(); 71 browser_window_.reset();
72 ExtensionServiceTestBase::TearDown(); 72 ExtensionServiceTestBase::TearDown();
73 } 73 }
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 ASSERT_TRUE(first_tab_info->GetInteger("id", &first_tab_id)); 197 ASSERT_TRUE(first_tab_info->GetInteger("id", &first_tab_id));
198 EXPECT_TRUE(ContainsValue(expected_tabs_ids, first_tab_id)); 198 EXPECT_TRUE(ContainsValue(expected_tabs_ids, first_tab_id));
199 199
200 int third_tab_id = -1; 200 int third_tab_id = -1;
201 ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id)); 201 ASSERT_TRUE(third_tab_info->GetInteger("id", &third_tab_id));
202 EXPECT_TRUE(ContainsValue(expected_tabs_ids, third_tab_id)); 202 EXPECT_TRUE(ContainsValue(expected_tabs_ids, third_tab_id));
203 } 203 }
204 } 204 }
205 205
206 } // namespace extensions 206 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/api/tabs/tabs_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698