cros: Enable Drive apps integration in app launcher.

chrome/browser/apps/drive/drive_app_provider_browsertest.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 "chrome/browser/apps/drive/drive_app_provider.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/apps/drive/drive_app_mapping.h"
 #include "chrome/browser/apps/drive/drive_service_bridge.h"
 #include "chrome/browser/drive/drive_app_registry.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/install_tracker.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/web_application_info.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 
 using extensions::AppLaunchInfo;
 using extensions::Extension;
 using extensions::ExtensionRegistry;
@@ skipping 38 matching lines @@
 
     fake_drive_service_.reset(new drive::FakeDriveService);
     fake_drive_service_->LoadAppListForDriveApi("drive/applist_empty.json");
     apps_registry_.reset(
         new drive::DriveAppRegistry(fake_drive_service_.get()));
 
     provider_.reset(new DriveAppProvider(profile()));
     provider_->SetDriveServiceBridgeForTest(
         make_scoped_ptr(new TestDriveServiceBridge(apps_registry_.get()))
             .PassAs<DriveServiceBridge>());
+
+    // The DriveAppProvider in AppListSyncalbeService interferes with the
+    // test. So resets it.
+    app_list::AppListSyncableServiceFactory::GetForProfile(profile())
+        ->ResetDriveAppProviderForTest();
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
     provider_.reset();
     apps_registry_.reset();
     fake_drive_service_.reset();
 
     ExtensionBrowserTest::TearDownOnMainThread();
   }
 
@@ skipping 356 matching lines @@
   InstallUserUrlApp(kLaunchUrl);
   EXPECT_FALSE(mapping()->IsChromeAppGenerated(url_app_id));
 
   fake_drive_service()->RemoveAppByProductId(kChromeAppId);
   RefreshDriveAppRegistry();
 
   // Url app is still present after the Drive app is disconnected.
   EXPECT_TRUE(ExtensionRegistry::Get(profile())->GetExtensionById(
       url_app_id, ExtensionRegistry::EVERYTHING));
 }