chrome/browser/extensions/chrome_app_sorting_unittest.cc - Issue 515563003: Remove dependency of chrome in WebRequestPermissions.

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/extensions/chrome_app_sorting_unittest.cc

Issue 515563003: Remove dependency of chrome in WebRequestPermissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated. Created 6 years, 3 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/extensions/chrome_app_sorting.cc ('k') | chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_app_sorting_unittest.cc

diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc

index 148e4f13ffa51a66e575a5168920d8d1c4e0cd7d..8d759b4e8a51256184e5b0c7e01d9b663dafb2b0 100644

--- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc

+++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc

@@ -7,8 +7,8 @@

#include <map>

#include "chrome/browser/extensions/./extension_prefs_unittest.h"

-#include "chrome/common/extensions/extension_constants.h"

#include "components/crx_file/id_util.h"

+#include "extensions/common/constants.h"

#include "extensions/common/manifest_constants.h"

#include "sync/api/string_ordinal.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -227,9 +227,9 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase {

// Make sure that the web store has valid ordinals.

syncer::StringOrdinal initial_ordinal =

syncer::StringOrdinal::CreateInitialOrdinal();

- app_sorting->SetPageOrdinal(extension_misc::kWebStoreAppId,

+ app_sorting->SetPageOrdinal(extensions::kWebStoreAppId,

initial_ordinal);

- app_sorting->SetAppLaunchOrdinal(extension_misc::kWebStoreAppId,

+ app_sorting->SetAppLaunchOrdinal(extensions::kWebStoreAppId,

initial_ordinal);

ExtensionIdList ids;

@@ -240,7 +240,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase {

static_cast<ChromeAppSorting*>(prefs()->app_sorting());

syncer::StringOrdinal page =

- app_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId);

+ app_sorting->GetPageOrdinal(extensions::kWebStoreAppId);

EXPECT_TRUE(page.IsValid());

ChromeAppSorting::PageOrdinalMap::iterator page_it =

@@ -248,7 +248,7 @@ class ChromeAppSortingInitializeWithNoApps : public PrefsPrepopulatedTestBase {

EXPECT_TRUE(page_it != app_sorting->ntp_ordinal_map_.end());

syncer::StringOrdinal app_launch =

- app_sorting->GetPageOrdinal(extension_misc::kWebStoreAppId);

+ app_sorting->GetPageOrdinal(extensions::kWebStoreAppId);

EXPECT_TRUE(app_launch.IsValid());

ChromeAppSorting::AppLaunchOrdinalMap::iterator app_launch_it =