chrome/browser/android/offline_pages/offline_page_utils_unittest.cc - Issue 1899433002: Update flags used by offline pages and bookmarks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

Issue 1899433002: Update flags used by offline pages and bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix test Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

diff --git a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

index eba47c93aef7829c1877b7ef2e5c0155250c3ced..a85eada1a01279ff93a450a917ef9d15c32b7ab2 100644

--- a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

+++ b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

@@ -9,6 +9,7 @@

#include "base/callback.h"

#include "base/command_line.h"

+#include "base/feature_list.h"

#include "base/files/file.h"

#include "base/files/file_path.h"

#include "base/files/file_util.h"

@@ -18,8 +19,8 @@

#include "chrome/browser/android/offline_pages/test_offline_page_model_builder.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/test/base/testing_profile.h"

+#include "components/offline_pages/offline_page_feature.h"

#include "components/offline_pages/offline_page_model.h"

-#include "components/offline_pages/offline_page_switches.h"

#include "components/offline_pages/offline_page_test_archiver.h"

#include "components/offline_pages/offline_page_test_store.h"

#include "components/offline_pages/proto/offline_pages.pb.h"

@@ -97,8 +98,11 @@ OfflinePageUtilsTest::~OfflinePageUtilsTest() {}

void OfflinePageUtilsTest::SetUp() {

// Enables offline pages feature.

// TODO(jianli): Remove this once the feature is completely enabled.

- base::CommandLine::ForCurrentProcess()->AppendSwitch(

- switches::kEnableOfflinePages);

+ base::FeatureList::ClearInstanceForTesting();

+ scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);

+ feature_list->InitializeFromCommandLine(

+ offline_pages::kOfflineBookmarksFeature.name, "");

+ base::FeatureList::SetInstance(std::move(feature_list));

// Set up the factory for testing.

OfflinePageModelFactory::GetInstance()->SetTestingFactoryAndUse(